model classes renamed