diff --git a/noinfo/cave_data/1623-2007-71.html b/noinfo/cave_data/1623-2007-71.html
index cc0a3c0ff..865b01d8c 100644
--- a/noinfo/cave_data/1623-2007-71.html
+++ b/noinfo/cave_data/1623-2007-71.html
@@ -43,8 +43,8 @@
 <depth>15m</depth>
 <extent></extent>
 <survex_file>caves/2007-71/2007-71.svx</survex_file>
-<description_file>1623/2007-71.html</description_file>
-<url>1623/2007-71.html</url>
+<description_file>1623/2007-71/2007-71.html</description_file>
+<url>1623/2007-71/2007-71.html</url>
 </cave>
 </body>
 </html>
diff --git a/noinfo/entrance_data/1623-2007-71a.html b/noinfo/entrance_data/1623-2007-71a.html
index 61da19a3a..60b62a0c1 100644
--- a/noinfo/entrance_data/1623-2007-71a.html
+++ b/noinfo/entrance_data/1623-2007-71a.html
@@ -16,7 +16,7 @@
 <location_description>Plateau</location_description>
 <approach>From 97</approach>
 <underground_description></underground_description>
-<photo><p><a href="../expofiles/photos/2007/Olly/IMG_2645.JPG"><img src="1623/2007-71/IMG_2645_small.jpg"></a></p><p>Photo &copy; Olly Betts 2007</p></photo>
+<photo><p><a href="../expofiles/photos/2007/Olly/IMG_2645.JPG"><img src="IMG_2645_small.jpg"></a></p><p>Photo &copy; Olly Betts 2007</p></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/noinfo/entrance_data/1623-2007-71b.html b/noinfo/entrance_data/1623-2007-71b.html
index 70c59c4e0..02d6df161 100644
--- a/noinfo/entrance_data/1623-2007-71b.html
+++ b/noinfo/entrance_data/1623-2007-71b.html
@@ -16,7 +16,7 @@
 <location_description>Plateau</location_description>
 <approach>From 97 or 2007-71a</approach>
 <underground_description></underground_description>
-<photo><p><a href="../expofiles/photos/2015/OllyJenny/jenny-at-2007-71c_20651320329_o.jpg"><img src="1623/2007-71/jenny-bolting-at-2007-71b_20828661702_small.jpg"></a></p><p>Photo &copy; Olly Betts 2015</p></photo>
+<photo><p><a href="../expofiles/photos/2015/OllyJenny/jenny-at-2007-71c_20651320329_o.jpg"><img src="jenny-bolting-at-2007-71b_20828661702_small.jpg"></a></p><p>Photo &copy; Olly Betts 2015</p></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/noinfo/entrance_data/1623-2007-71c.html b/noinfo/entrance_data/1623-2007-71c.html
index a9cecc627..9a7a9e887 100644
--- a/noinfo/entrance_data/1623-2007-71c.html
+++ b/noinfo/entrance_data/1623-2007-71c.html
@@ -16,7 +16,7 @@
 <location_description>Plateau</location_description>
 <approach>From 97</approach>
 <underground_description></underground_description>
-<photo><p><a href="../expofiles/photos/2015/OllyJenny/jenny-at-2007-71c_20651320329_o.jpg"><img src="1623/2007-71/jenny-at-2007-71c_20651320329_small.jpg"></a></p><p>Photo &copy; Olly Betts 2015</p></photo>
+<photo><p><a href="../expofiles/photos/2015/OllyJenny/jenny-at-2007-71c_20651320329_o.jpg"><img src="jenny-at-2007-71c_20651320329_small.jpg"></a></p><p>Photo &copy; Olly Betts 2015</p></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,