Naming convention fixes
Merge origin/MainBranch into MainBranch