Cleaning up geard vs openshift 3 naming