Merge "Add container names for OC40"