diff --git a/cave_data/1623-2015-dl-02.html b/cave_data/1623-2015-dl-02.html
index 065f5e6ba..23de950dd 100644
--- a/cave_data/1623-2015-dl-02.html
+++ b/cave_data/1623-2015-dl-02.html
@@ -8,15 +8,15 @@
 <body>
 <cave>
 <non_public>False</non_public>
-<caveslug>1623-CUCC2015DL02</caveslug>
+<caveslug>1623-2015-DL-02</caveslug>
 <official_name>Chossy Death Slope Hoehle</official_name>
 <area>1623</area>
 <kataster_code></kataster_code>
 <kataster_number></kataster_number> 
-<unofficial_number>CUCC2015DL02</unofficial_number>
+<unofficial_number>2015-DL-02</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-CUCC2015DL02</entranceslug>
+  <entranceslug>1623-2015-DL-02</entranceslug>
   <letter>a</letter>
 </entrance>
 
@@ -34,7 +34,7 @@ Dan Lenartowicz</explorers>
 <extent></extent>
 <survex_file></survex_file>
 <description_file></description_file>
-<url>1623/CUCC2015DL02</url>
+<url>1623/2015-DL-02</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-CUCC2015DL02.html b/cave_data/1623-CUCC2015DL02.html
deleted file mode 100644
index 7bb93ff0b..000000000
--- a/cave_data/1623-CUCC2015DL02.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
-<!-- Only put one cave in this file -->
-<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<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-CUCC2015DL02</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>Chossy Death Slope Hoehle</official_name><!-- Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck--><!-- Name of the cave (normally in German) -->
-<area>1623</area><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
-<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
-
-    T   Trockenh&ouml;hlen (Dry caves)
-    W   Wasserh&ouml;hlen (Caves with water)
-   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
-    E   Eishohlen (Caves with ice formations)
-    S   Schachth&ouml;hlen (Caves with pitches)
-    H   Halbh&ouml;hlen (Rock shelters ?)
-
-    -   unerforscht (unexplored)
-    =   befahren (visited)
-    ×   teilweise vermessen (partly surveyed)
-    +   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>CUCC2015DL02</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-CUCC2015DL02</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>a</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>
-
-<explorers>Matt Watson
-Dan Lenartowicz</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<underground_description>2m high 15m wide horizontal entrance 2-3m climb down leads to 25* choss slope (V. loose!) after aprox 15m turns right around corner. Possible aven but not very promising. (QMC)</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references>CUCC2015DL02</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
-<extent></extent>
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2015-DL-02</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-CUCC2015DL02.html b/entrance_data/1623-2015-dl-02.html
similarity index 98%
rename from entrance_data/1623-CUCC2015DL02.html
rename to entrance_data/1623-2015-dl-02.html
index c1c0ec4c1..e3ca25478 100644
--- a/entrance_data/1623-CUCC2015DL02.html
+++ b/entrance_data/1623-2015-dl-02.html
@@ -8,7 +8,7 @@
 <body>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-CUCC2015DL02</slug>
+<slug>1623-2015-dl-02</slug>
 <name></name>
 <entrance_description>
 2m high 5m wide horizontal entrance leads to 2-3m climb down to a 25&deg; choss slope (very loose)
