Misc name changes
Company change
Merge branch 'master' into development