Complete rename of class.

Old source file deletion wasn't included in last commit.