metamodel package renamed to model and some other renames (again)