Changed ecore and gen models to reflect existing models.