Name changes and formatting
Merge from master
Merge and cleanup