added names, update capitlization