diff --git a/cave_data/1623-2001-03.html b/cave_data/1623-2001-03.html
index 920e8428f..bc76095aa 100644
--- a/cave_data/1623-2001-03.html
+++ b/cave_data/1623-2001-03.html
@@ -30,7 +30,7 @@ Roshni Gohil
 <underground_description>A short (~5m) down climb to short pitch into small choked chamber.</underground_description>
 <equipment>15m rope, tape</equipment>
 <references><a href="../../years/2001/log.htm#id2001-204-12">2001 logbook</a>
-<a href="/expofiles/photos/2016/Frank/CUCC200103-3.JPG">tag photo</a><a href="/expofiles/photos/2016/Frank/CUCC200103-3.JPG">tag photo</a><a href="/expofiles/photos/2016/Frank/CUCC200103-3.JPG">tag photo</a></references>
+<a href="/expofiles/photos/2016/FrankTulley/CUCC200103-3.JPG">tag photo</a><a href="/expofiles/photos/2016/FrankTulley/CUCC200103-3.JPG">tag photo</a><a href="/expofiles/photos/2016/FrankTulley/CUCC200103-3.JPG">tag photo</a></references>
 <survey></survey>
 <kataster_status></kataster_status>
 <underground_centre_line></underground_centre_line>
diff --git a/entrance_data/1623-2001-02.html b/entrance_data/1623-2001-02.html
index 6017abe6c..d8e262c82 100644
--- a/entrance_data/1623-2001-02.html
+++ b/entrance_data/1623-2001-02.html
@@ -20,7 +20,7 @@ various windows into pit only getting out of daylight at bottom. </entrance_desc
 <photo><div class="centre"><a href="/expofiles/photos/2013/JuliaDay/entrance2001-02_1.JPG">
 <img alt="2001-02 tag location" src="entrance2001-02_1-small.jpg"></a>
 <p>2001-02 tag position</p></div>
-<a href="/expofiles/photos/2016/Frank/CUCC200102-1.JPG">tag photo</a><a href="/expofiles/photos/2016/Frank/CUCC200102-2.JPG">tag photo</a><a href="/expofiles/photos/2016/Frank/CUCC200102-3.JPG">tag photo</a></photo>
+<a href="/expofiles/photos/2016/FrankTulley/CUCC200102-1.JPG">tag photo</a><a href="/expofiles/photos/2016/FrankTulley/CUCC200102-2.JPG">tag photo</a><a href="/expofiles/photos/2016/FrankTulley/CUCC200102-3.JPG">tag photo</a></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/entrance_data/1623-2007-70.html b/entrance_data/1623-2007-70.html
index 7b876f6da..d0d4d9741 100644
--- a/entrance_data/1623-2007-70.html
+++ b/entrance_data/1623-2007-70.html
@@ -16,7 +16,7 @@
 <location_description>Plateau</location_description>
 <approach>As for 2007-71a.</approach>
 <underground_description></underground_description>
-<photo><p><a href="../expofiles/photos/2007/Olly/IMG_2640.JPG"><img src="2007-70/IMG_2640_small.jpg"></a><a href="../expofiles/photos/2007/Olly/IMG_2641.JPG"><img src="2007-70/IMG_2641_small.jpg"></a></p>
+<photo><p><a href="../expofiles/photos/2007/OllyBetts/IMG_2640.JPG"><img src="2007-70/IMG_2640_small.jpg"></a><a href="../expofiles/photos/2007/OllyBetts/IMG_2641.JPG"><img src="2007-70/IMG_2641_small.jpg"></a></p>
 <p>Photos &copy; Jenny Black 2007</p></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/entrance_data/1623-2012-js-01.html b/entrance_data/1623-2012-js-01.html
index e2415428c..9d6f571f4 100644
--- a/entrance_data/1623-2012-js-01.html
+++ b/entrance_data/1623-2012-js-01.html
@@ -16,9 +16,9 @@
 <location_description>Large bowl near 204d</location_description>
 <approach>As for 204d</approach>
 <underground_description></underground_description>
-<photo><a href="/expofiles/photos/2016/Frank/CUCC2012JS1-1.JPG">tag photo</a><br/>
-<a href="/expofiles/photos/2016/Frank/CUCC2012JS1-2.JPG">tag photo</a><br/>
-<a href="/expofiles/photos/2016/Frank/CUCC2012JS1-3.JPG">tag photo</a></photo>
+<photo><a href="/expofiles/photos/2016/FrankTulley/CUCC2012JS1-1.JPG">tag photo</a><br/>
+<a href="/expofiles/photos/2016/FrankTulley/CUCC2012JS1-2.JPG">tag photo</a><br/>
+<a href="/expofiles/photos/2016/FrankTulley/CUCC2012JS1-3.JPG">tag photo</a></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/entrance_data/1623-267.html b/entrance_data/1623-267.html
index 1e8fa0f99..b42c3ef38 100644
--- a/entrance_data/1623-267.html
+++ b/entrance_data/1623-267.html
@@ -16,7 +16,7 @@
 <location_description>100m up the 204 path from <a href="../1623/157/157.html">157</a> and 0/5, turn right and drop into small valley leading to entrance. This entrance was found by CUCC in 1987, but was not given a number because a carbide pig was found at the entrance and taken to be evidence of previous or ongoing exploration. The entrance was then lost for many years (except briefly when Brian Outram refound it and took the carbide pig, without realising its significance).  At one point it was postulated to be the same cave as <a href="../1623/2006-06/2006-06.html">Bogenh&ouml;hle</a>, but was finally relocated in 2007.</location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><table class="imgtable"><tr><td><a href="../../expofiles/photos/2007/Olly/IMG_2817.JPG"><img src="267/IMG_2817_small.jpg" /></a></td><td><a href="../../expofiles/photos/2015/OllyJenny/jenny-pointing-at-the-1987-02-tag-bolt_20077726964_o.jpg"><img src="267/jenny-pointing-at-the-1987-02-tag-bolt_20077726964_small.jpg" /></a></td></tr><tr class="caption"><td>Looking up valley towards entrance (halfway up on right).</td><td>Jenny pointing at tag bolt.</td></tr><tr><td>Photo &copy; Olly Betts 2007</td><td>Photo &copy; Olly Betts 2015</td></tr></table></photo>
+<photo><table class="imgtable"><tr><td><a href="../../expofiles/photos/2007/OllyBetts/IMG_2817.JPG"><img src="267/IMG_2817_small.jpg" /></a></td><td><a href="../../expofiles/photos/2015/OllyJenny/jenny-pointing-at-the-1987-02-tag-bolt_20077726964_o.jpg"><img src="267/jenny-pointing-at-the-1987-02-tag-bolt_20077726964_small.jpg" /></a></td></tr><tr class="caption"><td>Looking up valley towards entrance (halfway up on right).</td><td>Jenny pointing at tag bolt.</td></tr><tr><td>Photo &copy; Olly Betts 2007</td><td>Photo &copy; Olly Betts 2015</td></tr></table></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/entrance_data/1623-271a.html b/entrance_data/1623-271a.html
index 036c02fae..ec0f53282 100644
--- a/entrance_data/1623-271a.html
+++ b/entrance_data/1623-271a.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="271/IMG_2645_small.jpg"></a></p><p>Photo &copy; Olly Betts 2007</p></photo>
+<photo><p><a href="../expofiles/photos/2007/OllyBetts/IMG_2645.JPG"><img src="271/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/entrance_data/1623-271b.html b/entrance_data/1623-271b.html
index d57a3a40d..b3d4c246d 100644
--- a/entrance_data/1623-271b.html
+++ b/entrance_data/1623-271b.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-bolting-at-271b_20828661702_o.jpg"><img src="271/jenny-bolting-at-271b_20828661702_small.jpg"></a></p><p>Photo &copy; Olly Betts 2015</p></photo>
+<photo><p><a href="../expofiles/photos/2015/OllyJenny/jenny-bolting-at-2007-271b_20828661702_o.jpg"><img src="271/jenny-bolting-at-2007-271b_20828661702_small.jpg"></a></p><p>Photo &copy; Olly Betts 2015</p></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/entrance_data/1623-83.html b/entrance_data/1623-83.html
index d4dd10c60..1db224a62 100644
--- a/entrance_data/1623-83.html
+++ b/entrance_data/1623-83.html
@@ -16,7 +16,7 @@
 <location_description>Plateau, 200m north of <a href="82.htm">Br&auml;uningh&ouml;hle</a> (Kat. 82). This is not very obvious, since it is in an area of dwarf pine on a knoll south of the dry valley containing <a href="107.htm">Kat. 107</a>. However, the path to 204 (or at least the 2007 variant) passes about 10m from the entrance - going up the hill, pass the soil section, step down and up the rocky gully and it's on the left shortly after the pale green "christmas tree". </location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><p><a href="../expofiles/photos/2007/Olly/IMG_2761.JPG"><img src="83/IMG_2761_small.jpg"></a> <a href="../expofiles/photos/2007/Olly/IMG_2762.JPG"><img src="83/IMG_2762_small.jpg"></a></p><p>Photo &copy; Olly Betts 2007</p></photo>
+<photo><p><a href="../expofiles/photos/2007/OllyBetts/IMG_2761.JPG"><img src="83/IMG_2761_small.jpg"></a> <a href="../expofiles/photos/2007/OllyBetts/IMG_2762.JPG"><img src="83/IMG_2762_small.jpg"></a></p><p>Photo &copy; Olly Betts 2007</p></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,