More changes to align with general CloudForms team standards.