Reordering and renaming to match AWS templates