rename more component related model classes