Move away from class names.