fix class names so setup methods don't clobber each other