diff --git a/cave_data/1623-2014-867.html b/cave_data/1623-2014-867.html
index e861859a8..472b705b7 100644
--- a/cave_data/1623-2014-867.html
+++ b/cave_data/1623-2014-867.html
@@ -17,7 +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>14-867</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2014-867</caveslug><!--(Required). 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>1623</area><!-- e.g. "1623" -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
@@ -39,7 +39,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2014-867</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>14-867</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 -->
+  <entranceslug>1623-2014-867</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  14-867+14-867 'Z' == -->
   <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>
diff --git a/cave_data/1623-2014-BL-01.html b/cave_data/1623-2014-BL-01.html
index 9268451b7..7d0f1b1ec 100644
--- a/cave_data/1623-2014-BL-01.html
+++ b/cave_data/1623-2014-BL-01.html
@@ -17,7 +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>2014-BL-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2014-BL-01</caveslug><!--(Required). 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>1623</area><!-- e.g. "1623" -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
@@ -39,7 +39,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2014-BL-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>2014-BL-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 -->
+  <entranceslug>1623-2014-BL-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 -->
   <!-- DEBUG  2014-BL-01+2014-BL-01 'Z' == -->
   <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>
diff --git a/cave_data/1623-2014-NP-01.html b/cave_data/1623-2014-NP-01.html
index cdf63c25d..ec1ecb1ed 100644
--- a/cave_data/1623-2014-NP-01.html
+++ b/cave_data/1623-2014-NP-01.html
@@ -17,7 +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>2014-NP-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<caveslug>1623-2014-NP-01</caveslug><!--(Required). 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>1623</area><!-- e.g. "1623" -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
@@ -39,7 +39,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2014-NP-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>2014-NP-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 -->
+  <entranceslug>1623-2014-NP-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 -->
   <!-- DEBUG  2014-NP-01+2014-NP-01 'Z' == -->
   <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>
diff --git a/cave_data/pendingcaves.txt b/cave_data/pendingcaves.txt
index 369fc26e5..b9686ee2a 100644
--- a/cave_data/pendingcaves.txt
+++ b/cave_data/pendingcaves.txt
@@ -10,18 +10,18 @@
 1623-2014-MF-02 ; /walletedit/2014:23 close to BL888?
 1623-2014-MF-03 ; /walletedit/2014:23 close to BL888?
 
-2002-BUC-01 ; 2002#22  unrecognised cave name 'Brian"s unnamed cave'
-2002-14 ; 2002#14 Dead Tree Hole
+1623-2002-BUC-01 ; 2002#22  unrecognised cave name 'Brian"s unnamed cave'
+1623-2002-14 ; 2002#14 Dead Tree Hole
 
-2022-HH-01 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-02 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-03 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-04 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-05 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-06 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-07 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-08 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-09 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-10 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-11 ; 2022-08-01 logbook Hannah & Harry
-2022-HH-12 ; 2022-08-01 logbook Hannah & Harry
\ No newline at end of file
+1623-2022-HH-01 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-02 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-03 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-04 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-05 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-06 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-07 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-08 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-09 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-10 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-11 ; 2022-08-01 logbook Hannah & Harry
+1623-2022-HH-12 ; 2022-08-01 logbook Hannah & Harry
\ No newline at end of file
diff --git a/entrance_data/14-867.html b/entrance_data/1623-2014-867.html
similarity index 96%
rename from entrance_data/14-867.html
rename to entrance_data/1623-2014-867.html
index a261e6542..7c8d8f2bd 100644
--- a/entrance_data/14-867.html
+++ b/entrance_data/1623-2014-867.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>14-867</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1623-2014-867</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
diff --git a/entrance_data/2014-BL-01.html b/entrance_data/1623-2014-BL-01.html
similarity index 96%
rename from entrance_data/2014-BL-01.html
rename to entrance_data/1623-2014-BL-01.html
index cdf3fc9a9..ac5b7a33b 100644
--- a/entrance_data/2014-BL-01.html
+++ b/entrance_data/1623-2014-BL-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>2014-BL-01</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1623-2014-BL-01</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
diff --git a/entrance_data/2014-NP-01.html b/entrance_data/1623-2014-NP-01.html
similarity index 96%
rename from entrance_data/2014-NP-01.html
rename to entrance_data/1623-2014-NP-01.html
index 0b1b647d3..c9d93abbb 100644
--- a/entrance_data/2014-NP-01.html
+++ b/entrance_data/1623-2014-NP-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>2014-NP-01</slug> <!-- one entrance and one slug per entrance_data file -->
+<slug>1623-2014-NP-01</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>