more renaming to entity from model where we're really talking about an entity