rename classes to slightly-less-stupid names