Roy|000|Changes because of course config related class name changes