Merge "Renaming some classes to clarify what is what." into graphics-dev