Rename container names #2