Improved method and class names.