missed a couple of places where we were still using func instead of funcName