Set definition keys to schema names.
Merge branch 'master' into wip