Missing name changes.
Merge pull request #1 from orangemug/missing_name_changes

Missing name changes.