Fixed some more naming (oops)