Renaming some GL classes