Better naming and docs.
Fix tests due to delaying of config map.