Updated entities names