Bunch of naming errors fixed