renamed entity classes