diff --git a/cave_data/1623-2007-neu.html b/cave_data/1623-2007-NEU-01.html
similarity index 83%
rename from cave_data/1623-2007-neu.html
rename to cave_data/1623-2007-NEU-01.html
index 596fe96d9..5aa96f7c5 100644
--- a/cave_data/1623-2007-neu.html
+++ b/cave_data/1623-2007-NEU-01.html
@@ -17,9 +17,7 @@ the form documented at
 
 <cave>
 <non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
-<caveslug>1623-2007-neu</caveslug><!--(Ignored). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name>Nachbarschacht vom Grießkogel</official_name><!-- Name of the cave (normally in German)  Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
-<area>1623</area><!-- e.g. "1623" -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
@@ -36,11 +34,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2007-neu</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<unofficial_number>2007-NEU-01</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
-  <entranceslug>1623-2007-neu</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
-  <!-- DEBUG  1623-2007-neu+1623-2007-neu 'Z' == -->
+  <entranceslug>1623-2007-NEU-01</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
   <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
 </entrance>
 
@@ -58,7 +55,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <extent></extent>
 
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2007-neu/2007-neu.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
 </cave>
 </body>
 </html>
diff --git a/cave_data/1626-2023-BuzzardHole.html b/cave_data/1626-2023-BZ-01.html
similarity index 83%
rename from cave_data/1626-2023-BuzzardHole.html
rename to cave_data/1626-2023-BZ-01.html
index a8964ba70..66edcc1e9 100644
--- a/cave_data/1626-2023-BuzzardHole.html
+++ b/cave_data/1626-2023-BZ-01.html
@@ -17,9 +17,7 @@ the form documented at
 
 <cave>
 <non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
-<caveslug>1626-2023-BuzzardHole</caveslug><!--(Ignored). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name></official_name><!-- Name of the cave (normally in German)  Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
-<area>1626</area><!-- e.g. "1623" -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
@@ -36,11 +34,10 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   erforscht (exploration considered complete)
  -->
 <kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>2023-BuzzardHole</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<unofficial_number>2023-BZ-01</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
-  <entranceslug>1626-2023-BuzzardHole</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
-  <!-- DEBUG  1626-2023-BuzzardHole+1626-2023-BuzzardHole 'Z' == -->
+  <entranceslug>1626-2023-BZ-01</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
   <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
 </entrance>
 
@@ -58,7 +55,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <extent></extent>
 
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1626/2023-BuzzardHole/2023-BuzzardHole.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
 </cave>
 </body>
 </html>
diff --git a/entrance_data/1623-2007-neu.html b/entrance_data/1623-2007-NEU-01.html
similarity index 96%
rename from entrance_data/1623-2007-neu.html
rename to entrance_data/1623-2007-NEU-01.html
index eb880b824..ed012b602 100644
--- a/entrance_data/1623-2007-neu.html
+++ b/entrance_data/1623-2007-NEU-01.html
@@ -19,7 +19,7 @@ though, you do not need to do a data import as it happens automatically -->
 <br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2007-neu</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1623-2007-NEU-01</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers>ARGE</explorers>
diff --git a/entrance_data/1626-2023-BuzzardHole.html b/entrance_data/1626-2023-BZ-01.html
similarity index 96%
rename from entrance_data/1626-2023-BuzzardHole.html
rename to entrance_data/1626-2023-BZ-01.html
index 78944bee6..c954f3f9d 100644
--- a/entrance_data/1626-2023-BuzzardHole.html
+++ b/entrance_data/1626-2023-BZ-01.html
@@ -19,7 +19,7 @@ though, you do not need to do a data import as it happens automatically -->
 <br>
 <entrance>
 <non_public>False</non_public>
-<slug>1626-2023-BuzzardHole</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1626-2023-BZ-01</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers><a href="/logbookentry/2023-08-02/2023-08-02a">2023-08-02a</a></explorers>