Missed a whole bunch of naming corrections