diff --git a/noinfo/entrance_data/1623-CUCC 2014 NEO 01.html b/noinfo/entrance_data/1623-2014-NEO-01.html
similarity index 100%
rename from noinfo/entrance_data/1623-CUCC 2014 NEO 01.html
rename to noinfo/entrance_data/1623-2014-NEO-01.html
diff --git a/noinfo/entrance_data/1623-CUCC 2014 SD 01.html b/noinfo/entrance_data/1623-2014-SD-01.html
similarity index 88%
rename from noinfo/entrance_data/1623-CUCC 2014 SD 01.html
rename to noinfo/entrance_data/1623-2014-SD-01.html
index 558a8df76..69e2f4eb0 100644
--- a/noinfo/entrance_data/1623-CUCC 2014 SD 01.html	
+++ b/noinfo/entrance_data/1623-2014-SD-01.html
@@ -1,49 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<!-- Only put one entrance in this file -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<entrance>
-<non_public>False</non_public>
-<slug>1623-CUCC-2014-SD-01</slug>
-<name></name>
-<entrance_description>Large shaft, 7m pitch onto snow plug</entrance_description>
-<explorers>Matt Watson
-David Walker
-Sophie Draper</explorers>
-<map_description></map_description>
-<location_description></location_description>
-<approach>Follow cairned path from Tunnocks</approach>
-<underground_description></underground_description>
-<photo></photo>
-<!-- marking options: P  = Paint,
-                      P? = Paint (?),
-                      T  = Tag,
-                      T? = Tag (?),
-                      R  = Retagged,
-                      S  = Spit,
-                      S? = Spit (?),
-                      U  = Unmarked,
-                      ?  = Unknown" -->
-<marking>T</marking> 
-<marking_comment></marking_comment>
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability>S</findability>
-<findability_description></findability_description>
-<alt></alt>
-<northing></northing>
-<easting></easting> 
-<tag_station></tag_station>
-<exact_station></exact_station>
-<other_station></other_station>
-<other_description></other_description>
-<bearings>36498 84501 1822</bearings>
-<url></url>
-</entrance>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!-- Only put one entrance in this file -->
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<entrance>
+<non_public>False</non_public>
+<slug>1623-CUCC-2014-SD-01</slug>
+<name></name>
+<entrance_description>Large shaft, 7m pitch onto snow plug</entrance_description>
+<explorers>CUCC 2014 (Matt Watson, David Walker, Sophie Draper)</explorers>
+<map_description></map_description>
+<location_description></location_description>
+<approach>Follow cairned path from Tunnocks, upon reaching a steep stony gully, climb up keeping left. </approach>
+<underground_description></underground_description>
+<photo></photo>
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
+<marking>T</marking> 
+<marking_comment></marking_comment>
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
+<findability>S</findability>
+<findability_description></findability_description>
+<alt></alt>
+<northing></northing>
+<easting></easting> 
+<tag_station></tag_station>
+<exact_station></exact_station>
+<other_station></other_station>
+<other_description></other_description>
+<bearings>36498 84501 1822</bearings>
+<url></url>
+</entrance>
+</body>
+</html>
diff --git a/noinfo/entrance_data/1623-CUCC 2014 SD 01A.html b/noinfo/entrance_data/1623-CUCC 2014 SD 01A.html
deleted file mode 100644
index 4c2005076..000000000
--- a/noinfo/entrance_data/1623-CUCC 2014 SD 01A.html	
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<!-- Only put one entrance in this file -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<entrance>
-<non_public>False</non_public>
-<slug>1623-CUCC 2014 SD 01A</slug>
-<name></name>
-<entrance_description>Large hole, 7m pitch onto snow plug</entrance_description>
-<explorers>Matt W. Sophie D. David W. -CUCC 2014</explorers>
-<map_description></map_description>
-<location_description>Follow cairned path from Tunnocks, upon reaching a steep stony gully, climb up keeping left. </location_description>
-<approach></approach>
-<underground_description></underground_description>
-<photo></photo>
-<!-- marking options: P  = Paint,
-                      P? = Paint (?),
-                      T  = Tag,
-                      T? = Tag (?),
-                      R  = Retagged,
-                      S  = Spit,
-                      S? = Spit (?),
-                      U  = Unmarked,
-                      ?  = Unknown" -->
-<marking>T</marking> 
-<marking_comment></marking_comment>
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability>S</findability>
-<findability_description></findability_description>
-<alt></alt>
-<northing></northing>
-<easting></easting> 
-<tag_station></tag_station>
-<exact_station></exact_station>
-<other_station></other_station>
-<other_description></other_description>
-<bearings>36498 84501 1822</bearings>
-<url></url>
-</entrance>
-</body>
-</html>
