Missed a few variable rename from last commit