Renaming some classes for brevity