More consistent naming conventions