capitalize
rename
minor name changes