Renamed the metamodel packages