Bug 1023819 - Follow-up, rename class to follow naming standards r=me