Minor output scheme changes.
Adapting output scheme changes.
Regenerating ecore classes due to output scheme changes.