Change functions to match new ONOS scripts