Some renaming for removing .class suffix