More consistent naming convention in schema