Changed names on Roles to Role and Types to Type