renamed entities to be more consistent