CMS-1869 Rename modules for model classes used in RemoteService