KRACOEUS-6955: remove more outdated class names
KRACOEUS-6955: code review comments
Merge pull request #409 from leoherbie/class_name

KRACOEUS-6955: remove more outdated class names