r8951: class rename, add missing file