Change ordering, rename a header and add alignment convention.