Rename and add alignment