Oops cleans up bad naming