Renaming and orientation issue