Overlays: Shortened some of the class names