Tagged as a merge-request so that people may notice the unified container names and use them too. @Development
