big freaking long-overdue classname refactoring