Merge "Reflected class name and bc file name changes."