diff --git a/.github/ISSUE_TEMPLATE/community_submission.yaml b/.github/ISSUE_TEMPLATE/community_submission.yaml
index d379e65..812b18c 100644
--- a/.github/ISSUE_TEMPLATE/community_submission.yaml
+++ b/.github/ISSUE_TEMPLATE/community_submission.yaml
@@ -14,7 +14,7 @@ body:
         - Each object must include **at least one** of:
           - `registration_number`
           - `transponder_code_hex` (6 uppercase hex chars, e.g., `ABC123`)
-          - `planequery_airframe_id`
+          - `openairframes_id`
         - Your contributor name (entered below) will be applied to all objects.
         - `contributor_uuid` is derived from your GitHub account automatically.
         - `creation_timestamp` is created by the system (you may omit it).
diff --git a/schemas/community_submission.v1.schema.json b/schemas/community_submission.v1.schema.json
index 967ad05..cc495b1 100644
--- a/schemas/community_submission.v1.schema.json
+++ b/schemas/community_submission.v1.schema.json
@@ -12,7 +12,7 @@
       "type": "string",
       "pattern": "^[0-9A-F]{6}$"
     },
-    "planequery_airframe_id": {
+    "openairframes_id": {
       "type": "string",
       "minLength": 1
     },
@@ -72,7 +72,7 @@
         },
         {
           "required": [
-            "planequery_airframe_id"
+            "openairframes_id"
           ]
         }
       ]
diff --git a/src/contributions/create_daily_community_release.py b/src/contributions/create_daily_community_release.py
index f709d24..210e810 100644
--- a/src/contributions/create_daily_community_release.py
+++ b/src/contributions/create_daily_community_release.py
@@ -47,7 +47,7 @@ def submissions_to_dataframe(submissions: list[dict]) -> pd.DataFrame:
     - creation_timestamp (first)
     - transponder_code_hex
     - registration_number  
-    - planequery_airframe_id
+    - openairframes_id
     - contributor_name
     - [other columns alphabetically]
     - contributor_uuid (last)
@@ -62,7 +62,7 @@ def submissions_to_dataframe(submissions: list[dict]) -> pd.DataFrame:
         "creation_timestamp",
         "transponder_code_hex",
         "registration_number",
-        "planequery_airframe_id",
+        "openairframes_id",
         "contributor_name",
         "contributor_uuid",
     ]
@@ -78,7 +78,7 @@ def submissions_to_dataframe(submissions: list[dict]) -> pd.DataFrame:
         "creation_timestamp",
         "transponder_code_hex",
         "registration_number",
-        "planequery_airframe_id",
+        "openairframes_id",
         "contributor_name",
     ]
     last_cols = ["contributor_uuid"]
@@ -108,7 +108,7 @@ def main():
             "creation_timestamp",
             "transponder_code_hex",
             "registration_number",
-            "planequery_airframe_id",
+            "openairframes_id",
             "contributor_name",
             "tags",
             "contributor_uuid",
diff --git a/src/contributions/read_community_data.py b/src/contributions/read_community_data.py
index c9ab44b..525e467 100644
--- a/src/contributions/read_community_data.py
+++ b/src/contributions/read_community_data.py
@@ -112,8 +112,8 @@ def group_by_identifier(submissions: list[dict]) -> dict[str, list[dict]]:
             key = f"reg:{submission['registration_number']}"
         elif "transponder_code_hex" in submission:
             key = f"icao:{submission['transponder_code_hex']}"
-        elif "planequery_airframe_id" in submission:
-            key = f"id:{submission['planequery_airframe_id']}"
+        elif "openairframes_id" in submission:
+            key = f"id:{submission['openairframes_id']}"
         else:
             key = "_unknown"
         
diff --git a/src/derive_from_faa_master_txt.py b/src/derive_from_faa_master_txt.py
index 532d3f3..ea4d167 100644
--- a/src/derive_from_faa_master_txt.py
+++ b/src/derive_from_faa_master_txt.py
@@ -29,8 +29,8 @@ def convert_faa_master_txt_to_df(zip_path: Path, date: str):
     certification = pd.json_normalize(df["certification"].where(df["certification"].notna(), {})).add_prefix("certificate_")
     df = df.drop(columns="certification").join(certification)
     
-    # Create planequery_airframe_id
-    df["planequery_airframe_id"] = (
+    # Create openairframes_id
+    df["openairframes_id"] = (
         normalize(df["aircraft_manufacturer"])
         + "|"
         + normalize(df["aircraft_model"])
@@ -38,11 +38,11 @@ def convert_faa_master_txt_to_df(zip_path: Path, date: str):
         + normalize(df["serial_number"])
     )
     
-    # Move planequery_airframe_id to come after registration_number
+    # Move openairframes_id to come after registration_number
     cols = df.columns.tolist()
-    cols.remove("planequery_airframe_id")
+    cols.remove("openairframes_id")
     reg_idx = cols.index("registration_number")
-    cols.insert(reg_idx + 1, "planequery_airframe_id")
+    cols.insert(reg_idx + 1, "openairframes_id")
     df = df[cols]
     
     # Convert all NaN to empty strings