CON-1789 Refactoring - Adjusting classes and ids names to coding conventions - changing ommited class name