Fixes a couple of naming errors