More consistent naming and styling