Changing yaml files to work with the new common namespace