Reverted EntityTypes.COMPANY nomenclature