promote and use CloudMachineNamer so we get nice machine names; and tidy class names here for consistency