Added Entity Type Provider and changed names