diff --git a/osm_fieldwork/update_xlsform.py b/osm_fieldwork/update_xlsform.py
index 31ff22df..934682dc 100644
--- a/osm_fieldwork/update_xlsform.py
+++ b/osm_fieldwork/update_xlsform.py
@@ -162,8 +162,8 @@ async def append_mandatory_fields(
         BytesIO: the update XLSForm, wrapped in BytesIO.
     """
     custom_sheets = pd.read_excel(custom_form, sheet_name=None, engine="calamine")
-    mandatory_sheets = pd.read_excel(f"{xlsforms_path}/fmtm/mandatory_fields.xls", sheet_name=None, engine="calamine")
-    digitisation_sheets = pd.read_excel(f"{xlsforms_path}/fmtm/digitisation_fields.xls", sheet_name=None, engine="calamine")
+    mandatory_sheets = pd.read_excel(f"{xlsforms_path}/common/mandatory_fields.xls", sheet_name=None, engine="calamine")
+    digitisation_sheets = pd.read_excel(f"{xlsforms_path}/common/digitisation_fields.xls", sheet_name=None, engine="calamine")
 
     # Merge 'survey' and 'choices' sheets
     if "survey" in custom_sheets:
diff --git a/osm_fieldwork/xlsforms/fmtm/README.md b/osm_fieldwork/xlsforms/common/README.md
similarity index 83%
rename from osm_fieldwork/xlsforms/fmtm/README.md
rename to osm_fieldwork/xlsforms/common/README.md
index b81d378a..7e8379fc 100644
--- a/osm_fieldwork/xlsforms/fmtm/README.md
+++ b/osm_fieldwork/xlsforms/common/README.md
@@ -1,9 +1,9 @@
-# FMTM Forms
+# Common Form Snippets
 
 These forms are not valid XLSForms by themselves.
 
 Instead they contain fields to be used to concatenate and create forms
-that are used for a standardised FMTM mapping workflow.
+that are used for a standardised mapping workflow.
 
 - `mandatory_fields.xls` contains mandatory fields for FMTM such as
   the feature and task id selections.
diff --git a/osm_fieldwork/xlsforms/fmtm/digitisation_fields.xls b/osm_fieldwork/xlsforms/common/digitisation_fields.xls
similarity index 100%
rename from osm_fieldwork/xlsforms/fmtm/digitisation_fields.xls
rename to osm_fieldwork/xlsforms/common/digitisation_fields.xls
diff --git a/osm_fieldwork/xlsforms/fmtm/mandatory_fields.xls b/osm_fieldwork/xlsforms/common/mandatory_fields.xls
similarity index 100%
rename from osm_fieldwork/xlsforms/fmtm/mandatory_fields.xls
rename to osm_fieldwork/xlsforms/common/mandatory_fields.xls