Overlays: Shortened some of the class names
Merge pull request #3732 from pjackson28/improveoverlay

Overlays: Shortened some of the class names