Fixed rest of naming errors