For clarity, when you say you're adopting naming scheme from schema.org, you're taking their naming scheme but changing the convention from camelCase to underscore_separated?