Some rearranging and renaming