Renaming and realigning