Standardise some build step names