SLN-451 #comment update names to match the openshift pattern