Refactor some weird naming conventions for locations