.......... [DEV-536] renamed some of the classes to match our guidelines