@yottagraph-app/data-model-skill 0.0.25 → 0.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yottagraph-app/data-model-skill",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "description": "Data model skill documentation for AI agents - entity types, properties, and schemas from Lovelace fetch sources",
   "repository": {
     "type": "git",

package/skill/dotauthority/DATA_DICTIONARY.md

@@ -21,15 +21,15 @@ This is a companion dataset to DOT Census (`dotcensus`), which covers company re
 A motor carrier, broker, or freight forwarder registered with FMCSA.
 
 - Primary key: `usdot_number` (USDOT number assigned by FMCSA)
-- Entity resolver: named entity. Strong ID = `usdot_number`. Disambiguation via legal name and business address.
-- Entity name: DBA name if present (with legal name as the owner entity); otherwise the legal name.
+- Entity resolver: named entity. Strong ID = `usdot_number` when present. Disambiguation via legal name, optional DBA, and business address.
+- Entity name: `LEGAL_NAME` from the source row. When `DBA_NAME` differs, it is emitted as the `dotauthority::doing_business_as` string property on this subject, not as a separate entity.
 
 ### `person`
 
-A named individual who is the legal owner of a carrier operating under a DBA name.
+A named individual registered as a motor carrier (for example a sole proprietor).
 
-- Only created when the carrier has a DBA name different from the legal name, and the legal name appears to be a person (not an organization).
-- Entity resolver: named entity. No strong ID.
+- Record subject when `LEGAL_NAME` matches person-like name heuristics; otherwise the subject uses the `organization` flavor.
+- Entity resolver: named entity. When a USDOT number is present it is still attached as a strong ID for merging with census data.
 
 ### `location`
 
@@ -42,6 +42,8 @@ The business location of a carrier, derived from city, state, and country fields
 
 ## Properties
 
+FMCSA-specific fields use the DataSchema `namespace: dotauthority` (matching dataset `name` in `schema.yaml`). Fetch atoms use the qualified property key `dotauthority::<local_name>` (for example `dotauthority::doing_business_as`).
+
 ### Organization: Identity and Registration
 
 * `usdot_number`
@@ -49,11 +51,16 @@ The business location of a carrier, derived from city, state, and country fields
   * Examples: `1234567`, `3456789`
   * Derivation: `dot_number` field from the Socrata API. Carriers with DOT number `00000000` or empty are treated as not having a DOT number.
 
-* `dot_docket_number`
+* `dotauthority::docket_number`
   * Definition: FMCSA docket number (MC/FF/MX number) for the carrier's operating authority.
   * Examples: `MC012892`, `MC599911`
   * Derivation: `docket_number` field from the Socrata API.
 
+* `dotauthority::doing_business_as`
+  * Definition: Trade name or "doing business as" (DBA) name from FMCSA when it differs from the legal name.
+  * Examples: `ACME EXPRESS`, `SMITH TRUCKING`
+  * Derivation: `dba_name` when non-empty and not equal to `legal_name` (case-sensitive string comparison as in the streamer).
+
 ### Organization: Business Contact
 
 * `address`
@@ -61,53 +68,53 @@ The business location of a carrier, derived from city, state, and country fields
   * Examples: `1200 SEABOARD DR, HIALEAH, FL 33010`
   * Derivation: Composed from `bus_street_po`, `bus_city`, `bus_state_code`, `bus_zip_code`, and `bus_ctry_code` fields, formatted as "Street, City, State Zip".
 
-* `dot_phone_number`
+* `dotauthority::phone_number`
   * Definition: Primary business phone number of the carrier.
   * Examples: `5551234567`
   * Derivation: `bus_telno` field from the Socrata API.
 
 ### Organization: Authority Status
 
-* `dot_common_authority_status`
+* `dotauthority::common_authority_status`
   * Definition: Status of the carrier's common carrier authority.
   * Examples: `A (Active)`, `I (Inactive)`, `N (None)`
   * Derivation: `common_stat` field. Single-letter code expanded to include the human-readable label.
 
-* `dot_contract_authority_status`
+* `dotauthority::contract_authority_status`
   * Definition: Status of the carrier's contract carrier authority.
   * Examples: `A (Active)`, `I (Inactive)`, `N (None)`
   * Derivation: `contract_stat` field. Same code expansion as common authority.
 
-* `dot_broker_authority_status`
+* `dotauthority::broker_authority_status`
   * Definition: Status of the carrier's broker authority.
   * Examples: `A (Active)`, `I (Inactive)`, `N (None)`
   * Derivation: `broker_stat` field. Same code expansion as common authority.
 
-* `dot_authority_type`
+* `dotauthority::authority_type`
   * Definition: Authority type flags indicating which categories the carrier is authorized for.
   * Examples: `Property`, `Passenger`, `Household Goods`, `Property; Passenger`
   * Derivation: Composed from five checkbox fields (`property_chk`, `passenger_chk`, `hhg_chk`, `private_auth_chk`, `enterprise_chk`). Values with `Y` are included, joined with `; `.
 
 ### Organization: Insurance and Bonding
 
-* `dot_min_coverage_amount`
+* `dotauthority::min_coverage_amount`
   * Definition: Minimum insurance coverage amount required, in thousands of dollars.
   * Examples: `00750`, `05000`
   * Derivation: `min_cov_amount` field. Values of `00000` are suppressed.
 
-* `dot_cargo_insurance_required`
+* `dotauthority::cargo_insurance_required`
   * Definition: Whether cargo insurance is required for this carrier.
   * Examples: `1.0` (yes), `0.0` (no)
   * Derivation: `cargo_req` field. `Y` → 1.0, `N` → 0.0. Other values are not emitted.
   * Note: Stored as float per KG boolean convention.
 
-* `dot_bond_required`
+* `dotauthority::bond_required`
   * Definition: Whether a surety bond is required for this carrier.
   * Examples: `1.0` (yes), `0.0` (no)
   * Derivation: `bond_req` field. `Y` → 1.0, `N` → 0.0. Other values are not emitted.
   * Note: Stored as float per KG boolean convention.
 
-* `dot_bipd_insurance_on_file`
+* `dotauthority::bipd_insurance_on_file`
   * Definition: Bodily injury / property damage insurance filing amount on file.
   * Examples: `01000`, `05000`
   * Derivation: `bipd_file` field. Values of `00000` are suppressed.
@@ -118,12 +125,9 @@ The business location of a carrier, derived from city, state, and country fields
 
 ```
 organization ──[is_located_at]──→ location
-person       ──[doing_business_as]──→ organization
-organization ──[doing_business_as]──→ organization
+person       ──[is_located_at]──→ location
 ```
 
-The `doing_business_as` relationship is created when a carrier's legal name differs from its DBA name. The legal entity (person or organization, determined by name heuristics) is the subject; the DBA organization is the target. The DBA organization is also the primary record subject carrying all authority properties.
-
 The `is_located_at` relationship is created when both city and state are present. The target is a location entity named "City, State" (or "City, State, Country" if the country code is present).
 
 ---

package/skill/dotauthority/schema.yaml

@@ -25,9 +25,10 @@ flavors:
     passive: true
 
   - name: "person"
-    description: "A named individual such as a business owner, executive, or public figure"
+    description: "A real person as opposed to a fictional character, such as a CEO, politician, or public figure"
     display_name: "Person"
     mergeability: not_mergeable
+    strong_id_properties: ["usdot_number"]
     passive: true
 
   - name: "location"
@@ -43,15 +44,16 @@ properties:
     description: "USDOT number assigned by FMCSA, uniquely identifying a registered motor carrier, broker, or shipper"
     display_name: "USDOT Number"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     passive: true
 
-  - name: "dot_docket_number"
+  - name: "docket_number"
+    namespace: "dotauthority"
     type: string
     description: "FMCSA docket number (MC number) for operating authority"
     display_name: "Docket Number"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["MC012892", "MC599911"]
     passive: true
 
@@ -60,102 +62,113 @@ properties:
     description: "Physical street address of the entity"
     display_name: "Address"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["1200 SEABOARD DR, HIALEAH, FL 33010"]
     passive: true
 
-  - name: "dot_phone_number"
+  - name: "phone_number"
+    namespace: "dotauthority"
     type: string
     description: "Primary phone number of the carrier"
     display_name: "Phone Number"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["5551234567"]
     passive: true
 
-  - name: "dot_common_authority_status"
+  - name: "common_authority_status"
+    namespace: "dotauthority"
     type: string
     description: "Status of common carrier authority (A=Active, I=Inactive, N=None)"
     display_name: "Common Authority Status"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["A (Active)", "I (Inactive)", "N (None)"]
     passive: true
 
-  - name: "dot_contract_authority_status"
+  - name: "contract_authority_status"
+    namespace: "dotauthority"
     type: string
     description: "Status of contract carrier authority (A=Active, I=Inactive, N=None)"
     display_name: "Contract Authority Status"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["A (Active)", "I (Inactive)", "N (None)"]
     passive: true
 
-  - name: "dot_broker_authority_status"
+  - name: "broker_authority_status"
+    namespace: "dotauthority"
     type: string
     description: "Status of broker authority (A=Active, I=Inactive, N=None)"
     display_name: "Broker Authority Status"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["A (Active)", "I (Inactive)", "N (None)"]
     passive: true
 
-  - name: "dot_authority_type"
+  - name: "authority_type"
+    namespace: "dotauthority"
     type: string
     description: "Carrier authority type flags indicating property, passenger, household goods, private, or enterprise authorization"
     display_name: "Authority Type"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["Property", "Passenger", "Household Goods", "Property; Passenger"]
     passive: true
 
-  - name: "dot_min_coverage_amount"
+  - name: "min_coverage_amount"
+    namespace: "dotauthority"
     type: string
     description: "Minimum insurance coverage amount required (in thousands of dollars)"
     display_name: "Minimum Coverage Amount"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["00750", "05000"]
     passive: true
 
-  - name: "dot_cargo_insurance_required"
+  - name: "cargo_insurance_required"
+    namespace: "dotauthority"
     type: float
     description: "Whether cargo insurance is required (1.0 = yes, 0.0 = no)"
     display_name: "Cargo Insurance Required"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     passive: true
 
-  - name: "dot_bond_required"
+  - name: "bond_required"
+    namespace: "dotauthority"
     type: float
     description: "Whether a surety bond is required (1.0 = yes, 0.0 = no)"
     display_name: "Bond Required"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     passive: true
 
-  - name: "dot_bipd_insurance_on_file"
+  - name: "bipd_insurance_on_file"
+    namespace: "dotauthority"
     type: string
     description: "Bodily injury / property damage insurance filing amount"
     display_name: "BIPD Insurance On File"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["01000", "05000"]
     passive: true
 
-relationships:
   - name: "doing_business_as"
-    description: "A legal entity is doing business as (DBA) an organization"
-    display_name: "Doing Business As"
+    namespace: "dotauthority"
+    type: string
+    description: "FMCSA trade name or 'doing business as' (DBA) name when it differs from the legal name; stored as a string attribute on the legal-name entity, not a link to another entity"
+    display_name: "DOT Doing Business As"
     mergeability: not_mergeable
-    domain_flavors: ["person", "organization"]
-    target_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
+    examples: ["ACME EXPRESS", "SMITH TRUCKING", "CJ TRUCKING"]
     passive: true
 
+relationships:
   - name: "is_located_at"
     description: "An entity is located at, operates in, resides in, is headquartered in, was born in, visits, or died in a location"
     display_name: "Located At"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     target_flavors: ["location"]
     passive: true

package/skill/dotcensus/DATA_DICTIONARY.md

@@ -23,16 +23,12 @@ Each row represents one registered entity identified by a unique USDOT number. T
 A motor carrier, broker, shipper, or other entity registered with FMCSA.
 
 - Primary key: `usdot_number` (USDOT Number, unique per registrant)
-- Entity resolver: named entity, MERGEABLE. Strong ID = `usdot_number`. Disambiguation snippet includes the physical address when available.
-- Name: uses `DBA_NAME` when it differs from `LEGAL_NAME`; otherwise uses `LEGAL_NAME`.
+- Entity resolver: named entity, MERGEABLE. Strong ID = `usdot_number`. Disambiguation snippet includes DBA (when present) and physical address when available.
+- Name: `LEGAL_NAME`. When `DBA_NAME` differs, it is emitted as the `dotcensus::doing_business_as` string property on this subject, not as a separate entity.
 
-### `legal_entity`
+### `person`
 
-The legal owner of a carrier when `LEGAL_NAME` differs from `DBA_NAME`. Represents the person or organization that legally owns the business operating under the DBA name.
-
-- Primary key: none (resolved by name)
-- Entity resolver: named entity, MERGEABLE. Disambiguation snippet includes the entity name.
-- Only produced when `DBA_NAME` is present and differs from `LEGAL_NAME`.
+Used as the record subject when `LEGAL_NAME` matches person-like name heuristics (sole proprietorships). Same USDOT strong ID and census properties as organization subjects.
 
 ### `location`
 
@@ -46,6 +42,8 @@ The physical location (city + state) of a registered carrier.
 
 ## Properties
 
+FMCSA-specific fields use the DataSchema `namespace: dotcensus` (matching dataset `name` in `schema.yaml`). Fetch atoms use the qualified property key `dotcensus::<local_name>` (for example `dotcensus::doing_business_as`).
+
 ### Organization Properties
 
 #### Identity and Registration
@@ -55,87 +53,92 @@ The physical location (city + state) of a registered carrier.
   * Examples: `"12345"`, `"99999"`
   * Derivation: `DOT_NUMBER` column. Emitted as both a strong ID for entity resolution and as a property atom on every record.
 
+* `dotcensus::doing_business_as`
+  * Definition: Trade name or "doing business as" (DBA) from FMCSA when it differs from the legal name.
+  * Examples: `"Acme Transport"`, `"G & G TRANSPORTATION CO"`
+  * Derivation: `DBA_NAME` when non-empty and not equal to `LEGAL_NAME`.
+
 * `address`
   * Definition: Physical street address of the carrier.
   * Examples: `"21154 HWY EAST, SILOAM SPRINGS, AR 72761"`, `"100 Main St, Dallas, TX 75201"`
   * Derivation: Concatenation of `PHY_STREET`, `PHY_CITY`, `PHY_STATE`, and `PHY_ZIP` columns.
 
-* `dot_phone_number`
+* `dotcensus::phone_number`
   * Definition: Primary phone number on file with FMCSA.
   * Examples: `"5551234567"`
   * Derivation: `PHONE` column.
 
-* `dot_business_org_type`
+* `dotcensus::business_org_type`
   * Definition: Business organization type of the registrant.
   * Examples: `"Individual"`, `"Partnership"`, `"Corporation"`
   * Derivation: `BUSINESS_ORG_ID` column decoded from numeric codes (1=Individual, 2=Partnership, 3=Corporation).
 
-* `dot_entity_type`
+* `dotcensus::entity_type`
   * Definition: FMCSA entity type indicating the registrant's role in freight transportation.
   * Examples: `"Carrier"`, `"Carrier; Broker"`, `"Carrier; Shipper"`
   * Derivation: `CARSHIP` column. Semicolon-delimited code list decoded from single-letter codes (C=Carrier, B=Broker, S=Shipper, T=Cargo Tank, R=Registrant).
 
-* `dot_operating_authority`
+* `dotcensus::operating_authority`
   * Definition: Operating authority classification describing the carrier's authorization type.
   * Examples: `"AUTHORIZED FOR HIRE"`, `"PRIVATE PROPERTY"`, `"EXEMPT FOR HIRE"`
   * Derivation: `CLASSDEF` column, passed through as-is.
 
 #### Carrier Status and Operations
 
-* `dot_carrier_status`
+* `dotcensus::carrier_status`
   * Definition: FMCSA carrier registration status.
   * Examples: `"A (Active)"`, `"I (Inactive)"`, `"N (Not Authorized)"`
   * Derivation: `STATUS_CODE` column decoded from single-letter codes.
 
-* `dot_carrier_operation_type`
+* `dotcensus::carrier_operation_type`
   * Definition: Type of carrier operation based on registration.
   * Examples: `"A (Interstate)"`, `"B (Intrastate Hazmat)"`, `"C (Intrastate Non-Hazmat)"`
   * Derivation: `CARRIER_OPERATION` column decoded from single-letter codes.
-  * Note: The B/C distinction reflects the carrier's registration type, not actual hazmat activity. A carrier registered as C (non-hazmat) can still transport hazmat (see `dot_hazmat_indicator`).
+  * Note: The B/C distinction reflects the carrier's registration type, not actual hazmat activity. A carrier registered as C (non-hazmat) can still transport hazmat (see `dotcensus::hazmat_indicator`).
 
-* `dot_hazmat_indicator`
+* `dotcensus::hazmat_indicator`
   * Definition: Whether the carrier transports hazardous materials.
   * Examples: `1.0` (yes), `0.0` (no)
   * Derivation: `HM_Ind` column. `"Y"` → 1.0, `"N"` → 0.0. Omitted when blank.
 
 #### Fleet Composition
 
-* `dot_total_drivers`
+* `dotcensus::total_drivers`
   * Definition: Total number of drivers reported by the carrier.
   * Examples: `10.0`, `250.0`
   * Derivation: `TOTAL_DRIVERS` column, parsed as float. Omitted when zero or blank.
 
-* `dot_total_power_units`
+* `dotcensus::total_power_units`
   * Definition: Total number of power units (trucks, tractors) operated by the carrier.
   * Examples: `5.0`, `1200.0`
   * Derivation: `POWER_UNITS` column, parsed as float. Omitted when zero or blank.
 
-* `dot_total_bus_units`
+* `dotcensus::total_bus_units`
   * Definition: Total number of bus units operated by the carrier.
   * Examples: `2.0`, `50.0`
   * Derivation: `BUS_UNITS` column, parsed as float. Omitted when zero or blank.
 
-* `dot_fleet_size_category`
+* `dotcensus::fleet_size_category`
   * Definition: Fleet size category assigned by FMCSA based on total power units.
   * Examples: `"A (1-6 power units)"`, `"D (20-100 power units)"`, `"F (1000+ power units)"`
   * Derivation: `FLEETSIZE` column decoded from single-letter codes. Omitted when `"0"` (none reported).
 
 #### Safety
 
-* `dot_safety_rating`
+* `dotcensus::safety_rating`
   * Definition: FMCSA safety rating assigned during a compliance review.
   * Examples: `"Satisfactory"`, `"Conditional"`, `"Unsatisfactory"`
   * Derivation: `SAFETY_RATING` column decoded from single-letter codes (S, C, U).
   * Note: Most carriers have no safety rating — it is only assigned after a compliance review.
 
-* `dot_safety_rating_date`
+* `dotcensus::safety_rating_date`
   * Definition: Date the safety rating was assigned.
   * Examples: `"2024-01-01"`
   * Derivation: `SAFETY_RATING_DATE` column parsed from `YYYYMMDD` format, output as `YYYY-MM-DD`.
 
 #### Filing Dates
 
-* `dot_last_mcs150_filing_date`
+* `dotcensus::last_mcs150_filing_date`
   * Definition: Date the carrier last filed or updated their MCS-150 Motor Carrier Identification Report.
   * Examples: `"2024-01-01"`
   * Derivation: `MCS150_DATE` column parsed from `YYYYMMDD HHMM` format, output as `YYYY-MM-DD`.
@@ -149,9 +152,8 @@ Record timestamps are derived in priority order: `ADD_DATE` (carrier registratio
 ## Entity Relationships Summary
 
 ```
-legal_entity  ──[doing_business_as]──→ organization
 organization  ──[is_located_at]──────→ location
+person        ──[is_located_at]──────→ location
 ```
 
-- `doing_business_as`: Links the legal owner (`LEGAL_NAME`) to the business operating name (`DBA_NAME`). Only produced when the two names differ.
 - `is_located_at`: Links the carrier to its physical location. Only produced when both `PHY_CITY` and `PHY_STATE` are present.

package/skill/dotcensus/schema.yaml

@@ -25,9 +25,10 @@ flavors:
     passive: true
 
   - name: "person"
-    description: "A named individual such as a business owner, executive, or public figure"
+    description: "A real person as opposed to a fictional character, such as a CEO, politician, or public figure"
     display_name: "Person"
     mergeability: not_mergeable
+    strong_id_properties: ["usdot_number"]
     passive: true
 
   - name: "location"
@@ -43,7 +44,7 @@ properties:
     description: "USDOT number assigned by FMCSA, uniquely identifying a registered motor carrier, broker, or shipper"
     display_name: "USDOT Number"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["12345", "99999"]
     passive: true
 
@@ -52,145 +53,160 @@ properties:
     description: "Physical street address of the entity"
     display_name: "Address"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["21154 HWY EAST, SILOAM SPRINGS, AR 72761"]
     passive: true
 
-  - name: "dot_carrier_status"
+  - name: "carrier_status"
+    namespace: "dotcensus"
     type: string
     description: "FMCSA carrier registration status"
     display_name: "Carrier Status"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["A (Active)", "I (Inactive)", "N (Not Authorized)"]
     passive: true
 
-  - name: "dot_phone_number"
+  - name: "phone_number"
+    namespace: "dotcensus"
     type: string
     description: "Primary phone number of the carrier"
     display_name: "Phone Number"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["5551234567"]
     passive: true
 
-  - name: "dot_carrier_operation_type"
+  - name: "carrier_operation_type"
+    namespace: "dotcensus"
     type: string
     description: "Type of carrier operation"
     display_name: "Carrier Operation Type"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["A (Interstate)", "B (Intrastate Hazmat)", "C (Intrastate Non-Hazmat)"]
     passive: true
 
-  - name: "dot_safety_rating"
+  - name: "safety_rating"
+    namespace: "dotcensus"
     type: string
     description: "FMCSA safety rating assigned during compliance review"
     display_name: "Safety Rating"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["Satisfactory", "Conditional", "Unsatisfactory"]
     passive: true
 
-  - name: "dot_safety_rating_date"
+  - name: "safety_rating_date"
+    namespace: "dotcensus"
     type: string
     description: "Date the safety rating was assigned, derived from the SAFETY_RATING_DATE field"
     display_name: "Safety Rating Date"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     passive: true
 
-  - name: "dot_last_mcs150_filing_date"
+  - name: "last_mcs150_filing_date"
+    namespace: "dotcensus"
     type: string
     description: "Date the carrier last filed or updated their MCS-150 Motor Carrier Identification Report with FMCSA"
     display_name: "Last MCS-150 Filing Date"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     passive: true
 
-  - name: "dot_hazmat_indicator"
+  - name: "hazmat_indicator"
+    namespace: "dotcensus"
     type: float
     description: "Whether the carrier transports hazardous materials (1.0 = yes, 0.0 = no), derived from the HM_Ind field"
     display_name: "Hazmat Indicator"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     passive: true
 
-  - name: "dot_total_drivers"
+  - name: "total_drivers"
+    namespace: "dotcensus"
     type: float
     description: "Total number of drivers reported by the carrier"
     display_name: "Total Drivers"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     passive: true
 
-  - name: "dot_total_power_units"
+  - name: "total_power_units"
+    namespace: "dotcensus"
     type: float
     description: "Total number of power units (trucks, tractors) operated by the carrier"
     display_name: "Total Power Units"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     passive: true
 
-  - name: "dot_total_bus_units"
+  - name: "total_bus_units"
+    namespace: "dotcensus"
     type: float
     description: "Total number of bus units operated by the carrier"
     display_name: "Total Bus Units"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     passive: true
 
-  - name: "dot_fleet_size_category"
+  - name: "fleet_size_category"
+    namespace: "dotcensus"
     type: string
     description: "Fleet size category assigned by FMCSA based on the number of power units"
     display_name: "Fleet Size Category"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["A (1-6 power units)", "D (20-100 power units)", "F (1000+ power units)"]
     passive: true
 
-  - name: "dot_business_org_type"
+  - name: "business_org_type"
+    namespace: "dotcensus"
     type: string
     description: "Business organization type of the carrier"
     display_name: "Business Organization Type"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["Individual", "Partnership", "Corporation"]
     passive: true
 
-  - name: "dot_entity_type"
+  - name: "entity_type"
+    namespace: "dotcensus"
     type: string
     description: "FMCSA entity type indicating whether the entity operates as a carrier, broker, shipper, or combination"
     display_name: "Entity Type"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["Carrier", "Carrier; Broker", "Carrier; Shipper"]
     passive: true
 
-  - name: "dot_operating_authority"
+  - name: "operating_authority"
+    namespace: "dotcensus"
     type: string
     description: "Operating authority classification describing the carrier's authorization type"
     display_name: "Operating Authority"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     examples: ["AUTHORIZED FOR HIRE", "PRIVATE PROPERTY", "EXEMPT FOR HIRE"]
     passive: true
 
-relationships:
   - name: "doing_business_as"
-    description: "A legal entity is doing business as (DBA) an organization"
-    display_name: "Doing Business As"
+    namespace: "dotcensus"
+    type: string
+    description: "FMCSA trade name or 'doing business as' (DBA) name when it differs from the legal name; stored as a string attribute on the legal-name entity, not a link to another entity"
+    display_name: "DOT Doing Business As"
     mergeability: not_mergeable
-    domain_flavors: ["person", "organization"]
-    target_flavors: ["organization"]
-    examples: ["LUIS GALVAN doing business as G & G TRANSPORTATION CO"]
+    domain_flavors: ["organization", "person"]
+    examples: ["Acme Express", "G & G TRANSPORTATION CO", "CJ TRUCKING"]
     passive: true
 
+relationships:
   - name: "is_located_at"
     description: "An entity is located at, operates in, resides in, is headquartered in, was born in, visits, or died in a location"
     display_name: "Located At"
     mergeability: not_mergeable
-    domain_flavors: ["organization"]
+    domain_flavors: ["organization", "person"]
     target_flavors: ["location"]
     examples: ["DAYSPRING CARDS INC is located at SILOAM SPRINGS, AR"]
     passive: true

package/skill/faaregistry/schema.yaml

@@ -47,11 +47,11 @@ properties:
   # Identity and Registration
   - name: "aircraft_id"
     type: string
-    description: "Composite aircraft identifier combining manufacturer name and serial number (format: MANUFACTURER:SERIAL)"
+    description: "Composite aircraft identifier combining manufacturer name, model name, and serial number (format: MANUFACTURER:MODEL:SERIAL)"
     display_name: "Aircraft ID"
     mergeability: not_mergeable
     domain_flavors: ["aircraft"]
-    examples: ["CESSNA:172S10245", "BOEING:28-7990244"]
+    examples: ["CESSNA:172S:172S10245", "BOEING:737-800:28-7990244"]
     passive: true
 
   - name: "n_number"