Naming convention fixes
Merge origin/MainBranch into MainBranch
Bug fix in LinearCoordCalculator.