Small refractoring: renaming some classes