More consistent naming conventions.