Updated to use proper names