Couple of naming errors