Added missing Entity suffix to entity name.