Rename container names