ENGINE-255 Uniformisation of locations - code changes in relation to code review