renaming and alignment