Fixed cast renaming