Rename a existing container

Addresses #3036

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
I prefer to do reverse check: `container == nil`, because then there will be less indented code.