Corresponding rename changes for...

https://github.com/TheWeatherCompany/dasein-cloud-core/commit/d6f142778f21b58a3dc4426ce8d9573a7903a10a