Fixed Class name renaming