diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cd6065180..55cc4f95b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ All notable changes to this project will be documented in this file based on the
 * Add `event.kind` and `event.outcome`. #242
 * Add `client` and `server` objects and fields. #236
 * Reintroduce a streamlined `user_agent` field set. #240
+* Add `geo.name` for ad hoc location names. #248
 
 ### Improvements
 * Improved the definition of the file fields #196
diff --git a/README.md b/README.md
index 99f9938d04..d3679e9a1c 100644
--- a/README.md
+++ b/README.md
@@ -258,6 +258,7 @@ Note also that the `geo` fields are not expected to be used directly at the top
 | <a name="geo.city_name"></a>geo.city_name | City name. | core | keyword | `Montreal` |
 | <a name="geo.country_iso_code"></a>geo.country_iso_code | Country ISO code. | core | keyword | `CA` |
 | <a name="geo.region_iso_code"></a>geo.region_iso_code | Region ISO code. | core | keyword | `CA-QC` |
+| <a name="geo.name"></a>geo.name | User-defined description of a location, at the level of granularity they care about.<br/>Could be the name of their data centers, the floor number, if this describes a local physical entity, city names.<br/>Not typically used in automated geolocation. | extended | keyword | `boston-dc` |
 
 
 ## <a name="group"></a> Group fields
diff --git a/fields.yml b/fields.yml
index 6693e528d2..e61a756d9d 100644
--- a/fields.yml
+++ b/fields.yml
@@ -720,6 +720,18 @@
             Region ISO code.
           example: CA-QC
     
+        - name: name
+          level: extended
+          type: keyword
+          description: >
+            User-defined description of a location, at the level of granularity they care about.
+    
+            Could be the name of their data centers, the floor number, if this describes
+            a local physical entity, city names.
+    
+            Not typically used in automated geolocation.
+          example: boston-dc
+    
     - name: group
       title: Group
       group: 2
diff --git a/schema.csv b/schema.csv
index c52323c737..b201f7b1eb 100644
--- a/schema.csv
+++ b/schema.csv
@@ -73,6 +73,7 @@ geo.continent_name,keyword,core,North America
 geo.country_iso_code,keyword,core,CA
 geo.country_name,keyword,core,Canada
 geo.location,geo_point,core,"{ ""lon"": -73.614830, ""lat"": 45.505918 }"
+geo.name,keyword,extended,boston-dc
 geo.region_iso_code,keyword,core,CA-QC
 geo.region_name,keyword,core,Quebec
 group.id,keyword,extended,
diff --git a/schemas/geo.yml b/schemas/geo.yml
index 8553803f0e..f0c28b5971 100644
--- a/schemas/geo.yml
+++ b/schemas/geo.yml
@@ -65,3 +65,15 @@
       description: >
         Region ISO code.
       example: CA-QC
+
+    - name: name
+      level: extended
+      type: keyword
+      description: >
+        User-defined description of a location, at the level of granularity they care about.
+
+        Could be the name of their data centers, the floor number, if this describes
+        a local physical entity, city names.
+
+        Not typically used in automated geolocation.
+      example: boston-dc
diff --git a/template.json b/template.json
index 5ac3172cef..73b0621900 100644
--- a/template.json
+++ b/template.json
@@ -339,6 +339,10 @@
             "location": {
               "type": "geo_point"
             },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "region_iso_code": {
               "ignore_above": 1024,
               "type": "keyword"