Fix derp and make naming consistent