[BZ 1069648] Additional name refactoring.
[BZ 1069648] Short class names and also update the logic in a few places.