Added EntityRelatednessFactory and updated the names of
all EntityRelatedness