Tweaked metamodel package declarations #226