KRACOEUS-6955: remove more outdated class names

After looking at PR #408 I decided to see if there were other hardcoded class names in java files that I could clean up to make future repackaging easier.