Modify function name according latest cisco master