CDITCK-439 add default constructor and some injection point + minor class name refactoring