CMS-3057 Renaming of param classes to services