@memoarchitect/ontology 0.6.5 → 0.7.0

package/README.md

@@ -23,7 +23,7 @@ pin an exact release; the package has no repository or runtime dependency on Mem
 Tools or Memo Architect.
 
 ```bash
-pnpm add @memoarchitect/ontology@0.6.4
+pnpm add @memoarchitect/ontology@0.7.0
 ```
 
 > **Pre-1.0 notice:** ontology names, relationships, and package layout may

package/examples/connected-patient-monitor/model/catalog/project.sysml

@@ -0,0 +1,24 @@
+// Connected Patient Monitor — project identity and method binding.
+//
+// The native entrypoint. The imports name what this project contains and the
+// binding names the methodology it is governed by. No YAML file participates.
+package memo_examples_connected_patient_monitor_project {
+    private import ScalarValues::*;
+
+    private import memo_core_enumerations::*;
+    private import memo_methodology_core::*;
+    private import memo_methodology_profiles::*;
+
+    // The project's own content, imported so the catalog is one reachable
+    // closure from a single entrypoint.
+    private import memo_examples_connected_patient_monitor_viewpoints_unassigned::*;
+    private import memo_examples_connected_patient_monitor_viewpoints_unassigned_views_connected_patient_monitor_overview::*;
+
+    part projectBinding : ProjectMethodBinding {
+        attribute :>> id = "PMB-PATIENT-MONITOR-001";
+        attribute :>> name = "ConnectedPatientMonitorProjectMethodBinding";
+        attribute :>> projectName = "Connected Patient Monitor";
+        ref :>> selectedMethodology = mdDefaultDefinition;
+        attribute :>> scopeMode = ScopeModeKind::explicit;
+    }
+}

package/examples/connected-patient-monitor/model/catalog/viewpoints/unassigned/viewpoint.sysml

@@ -0,0 +1,9 @@
+// unassigned viewpoint.
+//
+// This project does not define its own viewpoint here; it binds the reusable
+// MEMO viewpoint that frames these concerns. The views it governs sit beneath
+// `views/`.
+package memo_examples_connected_patient_monitor_viewpoints_unassigned {
+    // The reusable package declaring unassigned could not be resolved during
+    // conversion. Import it here so the views beneath this viewpoint resolve.
+}

package/examples/connected-patient-monitor/model/{viewpoints → catalog/viewpoints/unassigned/views}/connected_patient_monitor_overview.sysml

@@ -1,4 +1,4 @@
-package memo_examples_connected_patient_monitor_viewpoints {
+package memo_examples_connected_patient_monitor_viewpoints_unassigned_views_connected_patient_monitor_overview {
     private import memo_examples_connected_patient_monitor::*;
     private import memo_viewpoints_definitions::*;
     private import memo_core_enumerations::*;

package/examples/embedded-infusion-pump/model/catalog/project.sysml

@@ -0,0 +1,24 @@
+// Embedded Infusion Pump — project identity and method binding.
+//
+// The native entrypoint. The imports name what this project contains and the
+// binding names the methodology it is governed by. No YAML file participates.
+package memo_examples_embedded_infusion_pump_project {
+    private import ScalarValues::*;
+
+    private import memo_core_enumerations::*;
+    private import memo_methodology_core::*;
+    private import memo_methodology_profiles::*;
+
+    // The project's own content, imported so the catalog is one reachable
+    // closure from a single entrypoint.
+    private import memo_examples_embedded_infusion_pump_viewpoints_unassigned::*;
+    private import memo_examples_embedded_infusion_pump_viewpoints_unassigned_views_embedded_infusion_pump_overview::*;
+
+    part projectBinding : ProjectMethodBinding {
+        attribute :>> id = "PMB-INFUSION-PUMP-001";
+        attribute :>> name = "EmbeddedInfusionPumpProjectMethodBinding";
+        attribute :>> projectName = "Embedded Infusion Pump";
+        ref :>> selectedMethodology = mdDefaultDefinition;
+        attribute :>> scopeMode = ScopeModeKind::explicit;
+    }
+}

package/examples/embedded-infusion-pump/model/catalog/viewpoints/unassigned/viewpoint.sysml

@@ -0,0 +1,9 @@
+// unassigned viewpoint.
+//
+// This project does not define its own viewpoint here; it binds the reusable
+// MEMO viewpoint that frames these concerns. The views it governs sit beneath
+// `views/`.
+package memo_examples_embedded_infusion_pump_viewpoints_unassigned {
+    // The reusable package declaring unassigned could not be resolved during
+    // conversion. Import it here so the views beneath this viewpoint resolve.
+}

package/examples/embedded-infusion-pump/model/{viewpoints → catalog/viewpoints/unassigned/views}/embedded_infusion_pump_overview.sysml

@@ -1,4 +1,4 @@
-package memo_examples_embedded_infusion_pump_viewpoints {
+package memo_examples_embedded_infusion_pump_viewpoints_unassigned_views_embedded_infusion_pump_overview {
     private import memo_examples_embedded_infusion_pump::*;
     private import memo_viewpoints_definitions::*;
     private import memo_core_enumerations::*;

package/examples/extensions/clinical/memo.package.yaml

@@ -1,9 +1,18 @@
-name: "@memoarchitect/example-extension-clinical"
-version: "0.6.1"
-type: methodology
-extends: "@memoarchitect/methodology-default"
-sysmlDir: "./src"
-description: "Example methodology extension for clinical-procedure vocabulary"
-license: "MIT"
-tags: ["memo", "methodology", "extension", "clinical"]
-usage: ["extension", "clinical-procedures"]
+# Application/distribution descriptor for this MEMO package.
+#
+# Identity and location only. It records what this package is called, what
+# version it is, and where its SysML source sits so a resolver can find it.
+# It does not select model content: the project's native SysML imports and its
+# ProjectMethodBinding decide what is in the model. Semantic fields
+# (`type`, `extends`, `usage`, `ontologies`, `methodology`, `modules`) were
+# removed at the native semantic flip and are now rejected if present.
+name: '@memoarchitect/example-extension-clinical'
+version: 0.6.1
+description: Example methodology extension for clinical-procedure vocabulary
+license: MIT
+tags:
+- memo
+- methodology
+- extension
+- clinical
+sysmlDir: ./src

package/examples/extensions/clinical/src/methodology/clinical_methodology.sysml

@@ -1,14 +1,22 @@
 package memo_extension_clinical_methodology {
     private import ScalarValues::*;
     private import memo_methodology_core::*;
+    private import memo_methodology_profiles::*;
+    private import memo_core_enumerations::*;
 
     part clinicalExtensionMethod : MethodologyDefinition {
         attribute :>> id = "EXT-CLINICAL-001";
         attribute :>> name = "ClinicalProcedureExtension";
-        attribute :>> version = "0.6.1";
+        attribute :>> version = "0.6.5";
         attribute :>> domain = "clinical procedures";
         attribute :>> description = "Adds optional clinical-procedure vocabulary to a MEMO project.";
-        attribute :>> baseMethodName = "MedicalDeviceLightDefault";
+        // The base is a typed SysML reference, not a name to keep in sync with
+        // another file. `baseMethodName` was the pre-flip spelling and no
+        // longer resolves.
+        ref :>> baseMethodology = mdDefaultDefinition;
+        // An extension adds its own module to whatever its base selected;
+        // saying so explicitly is required now that an empty list means empty.
+        attribute :>> scopeMode = ScopeModeKind::explicit;
         attribute :>> includedModule = "memo_extension_clinical";
     }
 }

package/examples/extensions/template/memo.package.yaml

@@ -1,9 +1,17 @@
-name: "{{name}}"
-version: "0.1.0"
-type: methodology
-extends: "@memoarchitect/methodology-default"
-sysmlDir: "./src"
-description: "MEMO methodology extension"
-license: "MIT"
-tags: ["memo", "methodology", "extension"]
-usage: ["extension"]
+# Application/distribution descriptor for this MEMO package.
+#
+# Identity and location only. It records what this package is called, what
+# version it is, and where its SysML source sits so a resolver can find it.
+# It does not select model content: the project's native SysML imports and its
+# ProjectMethodBinding decide what is in the model. Semantic fields
+# (`type`, `extends`, `usage`, `ontologies`, `methodology`, `modules`) were
+# removed at the native semantic flip and are now rejected if present.
+name: '{{name}}'
+version: 0.1.0
+description: MEMO methodology extension
+license: MIT
+tags:
+- memo
+- methodology
+- extension
+sysmlDir: ./src

package/examples/functional-logical-physical/model/catalog/project.sysml

@@ -0,0 +1,24 @@
+// Functional Logical Physical — project identity and method binding.
+//
+// The native entrypoint. The imports name what this project contains and the
+// binding names the methodology it is governed by. No YAML file participates.
+package memo_examples_functional_logical_physical_project {
+    private import ScalarValues::*;
+
+    private import memo_core_enumerations::*;
+    private import memo_methodology_core::*;
+    private import memo_methodology_profiles::*;
+
+    // The project's own content, imported so the catalog is one reachable
+    // closure from a single entrypoint.
+    private import memo_examples_functional_logical_physical_viewpoints_unassigned::*;
+    private import memo_examples_functional_logical_physical_viewpoints_unassigned_views_functional_logical_physical_overview::*;
+
+    part projectBinding : ProjectMethodBinding {
+        attribute :>> id = "PMB-LOGICAL-PHYSICAL-001";
+        attribute :>> name = "FunctionalLogicalPhysicalProjectMethodBinding";
+        attribute :>> projectName = "Functional Logical Physical";
+        ref :>> selectedMethodology = mdDefaultDefinition;
+        attribute :>> scopeMode = ScopeModeKind::explicit;
+    }
+}

package/examples/functional-logical-physical/model/catalog/viewpoints/unassigned/viewpoint.sysml

@@ -0,0 +1,9 @@
+// unassigned viewpoint.
+//
+// This project does not define its own viewpoint here; it binds the reusable
+// MEMO viewpoint that frames these concerns. The views it governs sit beneath
+// `views/`.
+package memo_examples_functional_logical_physical_viewpoints_unassigned {
+    // The reusable package declaring unassigned could not be resolved during
+    // conversion. Import it here so the views beneath this viewpoint resolve.
+}

package/examples/functional-logical-physical/model/{viewpoints → catalog/viewpoints/unassigned/views}/functional_logical_physical_overview.sysml

@@ -1,4 +1,4 @@
-package memo_examples_functional_logical_physical_viewpoints {
+package memo_examples_functional_logical_physical_viewpoints_unassigned_views_functional_logical_physical_overview {
     private import memo_examples_functional_logical_physical::*;
     private import memo_viewpoints_definitions::*;
     private import memo_core_enumerations::*;

package/examples/gpca-pump/methodology/gpca_methodology.sysml

@@ -1,11 +1,10 @@
+// The GPCA methodology package.
+//
+// The `ResolvesToMethodology` connection that used to live here bound a model
+// element to an authored `ResolvedMethodology` instance. A resolved methodology
+// is derived from the project binding and the methodology chain, so there is
+// nothing here to connect to: see `model/catalog/gpca_project.sysml` for the
+// binding, and `gpca_profiles.sysml` for the methodology it selects.
 package memo_examples_gpca_pump_methodology_gpca_methodology {
-    private import ScalarValues::*;
-
-    private import memo_methodology_profiles::*;
     private import memo_examples_gpca_pump_methodology_gpca_profiles::*;
-    private import memo_core_relationships::*;
-    private import memo_examples_gpca_pump_model_catalog_gpca_requirements::*;
-    private import memo_examples_gpca_pump_model_catalog_gpca_architecture::*;
-
-    connection : ResolvesToMethodology connect boundModelElement ::> tlm to resolvedMethodology ::> gpcaMethodResolved;
 }

package/examples/gpca-pump/methodology/gpca_profiles.sysml

@@ -1,25 +1,103 @@
+// GPCA prototype methodology.
+//
+// Converted from subtraction to explicit selection at the native semantic flip.
+// Before, this methodology said "the default, minus cybersecurity and SOUP" by
+// listing `excludedKind` entries on a separate `MethodologyScope` part. ADR-1-15
+// requires a methodology to declare its own final effective lists, so the
+// selection is now stated positively here and the scope part is gone.
+//
+// Two differences from the pre-flip behaviour are deliberate and recorded:
+//
+//  1. Cybersecurity is excluded by *not* selecting `memo_assurance_cybersecurity`
+//     and by two explicit RulePolicy entries disabling the cybersecurity closure
+//     rules. Before, `excludedKind` named eleven cybersecurity kinds; naming the
+//     discipline once is the same selection stated at the level the methodology
+//     metamodel supports.
+//  2. `SoftwareModule[moduleKind=soup]` cannot be expressed as an inclusion.
+//     Explicit selection works over kinds, not over instance attribute values,
+//     so a per-instance filter has no positive form. The GPCA model declares no
+//     SOUP module, so the effective element set is unchanged; the intent is
+//     recorded in this methodology's description and belongs to a project rule
+//     if it ever needs enforcing.
+//
+// The authored `gpcaMethodResolved : ResolvedMethodology` is gone. A resolved
+// methodology is derived from the binding and the methodology chain; authoring
+// one by hand created a second answer that no resolver produced.
 package memo_examples_gpca_pump_methodology_gpca_profiles {
     private import ScalarValues::*;
 
     private import memo_methodology_core::*;
     private import memo_methodology_profiles::*;
     private import memo_core_enumerations::*;
+    private import memo_rules_closure::*;
 
     part gpcaMethodDefinition : MethodologyDefinition {
         attribute :>> id = "METH-GPCA-001";
         attribute :>> name = "GPCAPrototypeMethodology";
-        attribute :>> version = "1.0";
+        attribute :>> version = "0.6.5";
         attribute :>> domain = "medical device modeling";
-        attribute :>> description = "GPCA infusion pump methodology — subtraction-based tailoring for non-networked prototype. Excludes cybersecurity layer and SOUP modules.";
-        attribute :>> baseMethodName = "MedicalDeviceLightDefault";
-    }
+        attribute :>> description = "GPCA infusion pump methodology for the non-networked prototype variant. Explicitly selects the five architecture layers and four of the five assurance disciplines; cybersecurity is out of scope because the prototype has no network interface. The prototype uses no SOUP.";
+        ref :>> baseMethodology = mdDefaultDefinition;
+        attribute :>> scopeMode = ScopeModeKind::explicit;
+
+        attribute :>> includedLayer = (
+            "memo_architecture_operational",
+            "memo_architecture_functional",
+            "memo_architecture_logical",
+            "memo_architecture_implementation",
+            "memo_architecture_realization"
+        );
+
+        // Explicit means explicit. A methodology that names its assurance
+        // disciplines and stops there selects no rules at all, because rules
+        // live in their own packages. Before the flip an empty list read as
+        // "everything", which hid exactly this: the selection said nothing and
+        // the tools behaved as though it said everything.
+        attribute :>> includedModule = (
+            "memo_core_common",
+            "memo_core_enumerations",
+            "memo_core_relationships",
+            "memo_core_annotations",
+            "memo_core_consistency_rules",
+            "memo_assurance_requirements",
+            "memo_assurance_requirements_needs",
+            "memo_assurance_safety_risk",
+            "memo_assurance_human_factors",
+            "memo_assurance_verification_validation",
+            "memo_rules_closure",
+            "memo_rules_crosslayer",
+            "memo_rules_quantitative",
+            "memo_rules_ontology"
+        );
+
+        attribute :>> includedStandard = (
+            "ISO 14971",
+            "IEC 62304",
+            "21 CFR 820",
+            "ISO 13485",
+            "ISO 14155",
+            "IEC 62366",
+            "IEC 60601-1"
+        );
+
+        attribute :>> includedArtifactKind = ("RiskManagementPlan");
+
+        attribute :>> includedViewpoint = ("VP-CTX", "VP-LOG", "VP-RISK");
+
+        part disableThreatMitigation : RulePolicy :> rulePolicy {
+            ref :>> targetRule : ThreatMitigationRule;
+            attribute :>> disposition = RuleDispositionKind::disabled;
+            attribute :>> rationaleText = "CR-MED-040 requires every threat to carry a mitigation. The prototype has no network or removable-media interface, so no threat is in scope and the rule can only report on elements this variant does not model.";
+            attribute :>> authority = "GPCA Systems Engineering Lead";
+            attribute :>> approvalReference = "GPCA-DHF-CR-0007";
+        }
 
-    part gpcaMethodResolved : ResolvedMethodology {
-        attribute :>> id = "RMETH-GPCA-001";
-        attribute :>> name = "GPCAPrototypeResolved";
-        attribute :>> version = "1.0";
-        attribute :>> safetyClassification = SafetyClassKind::C;
-        attribute :>> lifecycleStage = LifecycleStateKind::development;
-        attribute :>> resolutionSummary = "GPCA infusion pump — IEC 62304 Class C at development stage. Default scope minus cybersecurity and SOUP, as the prototype is non-networked.";
+        part disableAssetThreatLink : RulePolicy :> rulePolicy {
+            ref :>> targetRule : AssetThreatLinkRule;
+            attribute :>> disposition = RuleDispositionKind::disabled;
+            attribute :>> rationaleText = "CR-MED-041 requires every cybersecurity asset to trace to a threat. Cybersecurity is not a selected discipline for this variant, so the rule has no subjects and its absence is recorded here rather than left implicit.";
+            attribute :>> authority = "GPCA Systems Engineering Lead";
+            attribute :>> approvalReference = "GPCA-DHF-CR-0007";
+        }
     }
 }

package/examples/gpca-pump/model/catalog/gpca_analysis.sysml

@@ -1,4 +1,4 @@
-package memo_examples_gpca_pump_model_catalog_gpca_analysis {
+package memo_examples_gpca_pump_gpca_analysis {
     private import ScalarValues::*;
 
     private import memo_assurance_safety_risk_analysis::*;

package/examples/gpca-pump/model/catalog/gpca_architecture.sysml

@@ -1,4 +1,4 @@
-package memo_examples_gpca_pump_model_catalog_gpca_architecture {
+package memo_examples_gpca_pump_gpca_architecture {
     private import ScalarValues::*;
 
     private import memo_architecture_implementation_hardware_structure::*;

package/examples/gpca-pump/model/catalog/gpca_behavior_actions.sysml

@@ -1,6 +1,6 @@
-package memo_examples_gpca_pump_model_catalog_gpca_behavior_actions {
+package memo_examples_gpca_pump_gpca_behavior_actions {
     private import ScalarValues::*;
-    private import memo_examples_gpca_pump_model_catalog_gpca_architecture::*;
+    private import memo_examples_gpca_pump_gpca_architecture::*;
 
     private import memo_architecture_functional_behavior::*;
     private import memo_architecture_logical_interfaces::*;

package/examples/gpca-pump/model/catalog/gpca_behavior_modes.sysml

@@ -1,4 +1,4 @@
-package memo_examples_gpca_pump_model_catalog_gpca_behavior_modes {
+package memo_examples_gpca_pump_gpca_behavior_modes {
     private import ScalarValues::*;
 
     private import memo_architecture_functional_behavior::*;

package/examples/gpca-pump/model/catalog/gpca_behavior_subsystems.sysml

@@ -1,8 +1,12 @@
-package memo_examples_gpca_pump_model_catalog_gpca_behavior_subsystems {
+package memo_examples_gpca_pump_gpca_behavior_subsystems {
     private import ScalarValues::*;
 
     private import memo_architecture_functional_functions::*;
     private import memo_core_enumerations::*;
+    private import memo_architecture_logical_interfaces::*;
+    private import memo_architecture_operational_use_cases::*;
+    private import memo_assurance_requirements::*;
+    private import memo_core_common::*;
 
     // ── Logical functions ───────────────────────────────────────
     part fnAcquireSensors : SystemFunction {
@@ -110,7 +114,6 @@ package memo_examples_gpca_pump_model_catalog_gpca_behavior_subsystems {
         attribute :>> id = "LF-001";
         attribute :>> name = "SensorAcquisitionFlow";
         attribute :>> flowKind = FlowKind::measurement;
-        attribute :>> direction = DirectionKind::input;
         attribute :>> latencyBudgetMs = 20.0;
         attribute :>> staleAfterMs = 40.0;
         attribute :>> integrityLevel = "class C data path";
@@ -121,7 +124,6 @@ package memo_examples_gpca_pump_model_catalog_gpca_behavior_subsystems {
         attribute :>> id = "LF-002";
         attribute :>> name = "FlowCommandFlow";
         attribute :>> flowKind = FlowKind::command;
-        attribute :>> direction = DirectionKind::output;
         attribute :>> latencyBudgetMs = 20.0;
         attribute :>> staleAfterMs = 20.0;
         attribute :>> integrityLevel = "class C command path";
@@ -132,7 +134,6 @@ package memo_examples_gpca_pump_model_catalog_gpca_behavior_subsystems {
         attribute :>> id = "LF-003";
         attribute :>> name = "AlarmSignalFlow";
         attribute :>> flowKind = FlowKind::alarm;
-        attribute :>> direction = DirectionKind::output;
         attribute :>> latencyBudgetMs = 20.0;
         attribute :>> staleAfterMs = 20.0;
         attribute :>> integrityLevel = "class C alarm path; same-step delivery to infusion manager";
@@ -143,7 +144,6 @@ package memo_examples_gpca_pump_model_catalog_gpca_behavior_subsystems {
         attribute :>> id = "LF-004";
         attribute :>> name = "PrescriptionEntryFlow";
         attribute :>> flowKind = FlowKind::configuration;
-        attribute :>> direction = DirectionKind::input;
         attribute :>> latencyBudgetMs = 500.0;
         attribute :>> staleAfterMs = 0.0;
         attribute :>> integrityLevel = "confirmed double-entry path";

package/examples/gpca-pump/model/catalog/gpca_context.sysml

@@ -1,4 +1,4 @@
-package memo_examples_gpca_pump_model_catalog_gpca_context {
+package memo_examples_gpca_pump_gpca_context {
     private import ScalarValues::*;
 
     private import memo_architecture_operational_context_actors::*;
@@ -13,7 +13,7 @@ package memo_examples_gpca_pump_model_catalog_gpca_context {
         attribute :>> name = "GPCA_IntendedUse";
         attribute :>> title = "GPCA Pump Intended Use";
         attribute :>> shortDescription = "Patient-controlled analgesia infusion of prescribed opioid analgesics.";
-        attribute :>> longDescription = "The GPCA pump delivers a prescribed analgesic drug intravenously at a programmed basal rate, supplemented by square boluses delivered automatically at programmed intervals and by patient-requested bolus doses, subject to lockout intervals and maximum-dose limits.";
+        attribute :>> description = "The GPCA pump delivers a prescribed analgesic drug intravenously at a programmed basal rate, supplemented by square boluses delivered automatically at programmed intervals and by patient-requested bolus doses, subject to lockout intervals and maximum-dose limits.";
         attribute :>> indication = "Management of acute post-operative or chronic pain requiring titrated intravenous opioid analgesia.";
         attribute :>> contraindication = "Patients unable to comprehend or operate the bolus request mechanism; drugs without safe-value records in the hospital pharmacy database.";
         attribute :>> patientPopulation = "Adult in-patients under clinical supervision.";
@@ -26,7 +26,7 @@ package memo_examples_gpca_pump_model_catalog_gpca_context {
         attribute :>> name = "BolusRequestBySomeoneOtherThanPatient";
         attribute :>> title = "Bolus by proxy";
         attribute :>> shortDescription = "A caregiver or visitor presses the patient bolus control.";
-        attribute :>> longDescription = "A person other than the patient activates the bolus request control, bypassing the intended patient self-limiting behavior.";
+        attribute :>> description = "A person other than the patient activates the bolus request control, bypassing the intended patient self-limiting behavior.";
         attribute :>> misuseContext = "Patient-controlled analgesia in a supervised hospital setting.";
         attribute :>> foreseeableBasis = "Known PCA use pattern represented in the GPCA hazard analysis.";
         attribute :>> affectedUseContext = "UC-001";
@@ -51,7 +51,6 @@ package memo_examples_gpca_pump_model_catalog_gpca_context {
         attribute :>> actorKind = ActorKind::patient;
         attribute :>> id = "ACT-001";
         attribute :>> name = "Patient";
-        attribute :>> actorKind = ActorKind::patient;
         attribute :>> trainingLevel = "instructed by clinician on bolus request button only";
         attribute :>> description = "Receives the infusion and requests bolus doses via the patient pendant.";
     }
@@ -59,7 +58,6 @@ package memo_examples_gpca_pump_model_catalog_gpca_context {
         attribute :>> actorKind = ActorKind::clinician;
         attribute :>> id = "ACT-002";
         attribute :>> name = "ClinicianNurse";
-        attribute :>> actorKind = ActorKind::clinician;
         attribute :>> trainingLevel = "trained clinical user; programs prescriptions and responds to alarms";
         attribute :>> description = "Loads the drug reservoir, programs and confirms the prescription, starts/stops therapy, and responds to alarms.";
     }
@@ -67,7 +65,6 @@ package memo_examples_gpca_pump_model_catalog_gpca_context {
         attribute :>> actorKind = ActorKind::clinician;
         attribute :>> id = "ACT-003";
         attribute :>> name = "PrescribingPhysician";
-        attribute :>> actorKind = ActorKind::clinician;
         attribute :>> trainingLevel = "licensed prescriber";
         attribute :>> description = "Prescribes drug, concentration, basal rate, bolus volume, lockout interval, and maximum dose limits.";
     }
@@ -75,7 +72,6 @@ package memo_examples_gpca_pump_model_catalog_gpca_context {
         attribute :>> actorKind = ActorKind::clinician;
         attribute :>> id = "ACT-004";
         attribute :>> name = "Pharmacist";
-        attribute :>> actorKind = ActorKind::clinician;
         attribute :>> trainingLevel = "licensed pharmacist";
         attribute :>> description = "Prepares the drug reservoir and verifies drug and concentration against the prescription.";
     }
@@ -83,7 +79,6 @@ package memo_examples_gpca_pump_model_catalog_gpca_context {
         attribute :>> actorKind = ActorKind::technician;
         attribute :>> id = "ACT-005";
         attribute :>> name = "BiomedicalTechnician";
-        attribute :>> actorKind = ActorKind::technician;
         attribute :>> trainingLevel = "service-trained; authenticated service access";
         attribute :>> description = "Performs maintenance, battery replacement, and calibration through the service interface.";
     }

package/examples/gpca-pump/model/catalog/gpca_cybersecurity.sysml

@@ -1,4 +1,4 @@
-package memo_examples_gpca_pump_model_catalog_gpca_cybersecurity {
+package memo_examples_gpca_pump_gpca_cybersecurity {
     private import ScalarValues::*;
 
     private import memo_assurance_cybersecurity::*;
@@ -7,10 +7,10 @@ package memo_examples_gpca_pump_model_catalog_gpca_cybersecurity {
     private import memo_assurance_verification_validation::*;
     private import memo_core_enumerations::*;
     private import memo_core_relationships::*;
-    private import memo_examples_gpca_pump_model_catalog_gpca_architecture::*;
-    private import memo_examples_gpca_pump_model_catalog_gpca_risk::*;
-    private import memo_examples_gpca_pump_model_catalog_gpca_requirements::*;
-    private import memo_examples_gpca_pump_model_catalog_gpca_verification::*;
+    private import memo_examples_gpca_pump_gpca_architecture::*;
+    private import memo_examples_gpca_pump_gpca_risk::*;
+    private import memo_examples_gpca_pump_gpca_requirements::*;
+    private import memo_examples_gpca_pump_gpca_verification::*;
 
     part therapyConfigurationAsset : CybersecurityAsset {
         attribute :>> id = "AST-CYB-001";
@@ -78,7 +78,7 @@ package memo_examples_gpca_pump_model_catalog_gpca_cybersecurity {
         attribute :>> cweReference = "CWE-798";
     }
 
-    part tamperedConfigurationScenario : ThreatScenario {
+    action tamperedConfigurationScenario : ThreatScenario {
         attribute :>> id = "SCN-001";
         attribute :>> name = "TamperedTherapyConfigurationScenario";
         attribute :>> description = "An attacker with local access to the maintenance port alters lockout or dose parameters, aiming to bypass safety limits; may enable unsafe therapy delivery or bypass safeguards.";