Fixed some oopsies (name changes) that were missed on my last commit.