diff --git a/chunker b/chunker
index fa7d02e..7075179 100755
--- a/chunker
+++ b/chunker
@@ -48,9 +48,10 @@ do
   # rename it to archive-XXXXX and start a new current/
   if [[ $cur_size -gt $BYTES_PER_CHUNK ]]
   then
-    uuid=$(cat /proc/sys/kernel/random/uuid)
-    echo "Current archive is full, moving to ${uuid}."
-    mv "$CHUNKER_WORKING_DIR/current" "$PACKING_QUEUE_DIR/${uuid}"
+    timestamp=$( date +'%Y%m%d%H%M%S' )
+    uuid=$(cat /proc/sys/kernel/random/uuid | cut -d- -f1)
+    echo "Current archive is full, moving to ${timestamp}_${uuid}."
+    mv "$CHUNKER_WORKING_DIR/current" "$PACKING_QUEUE_DIR/${timestamp}_${uuid}"
     cur_size=0
     sleep 3
   fi
diff --git a/pack-one b/pack-one
index e6968ba..b798e77 100755
--- a/pack-one
+++ b/pack-one
@@ -55,7 +55,7 @@ mayicontinue
 ITEM=none
 while [[ $ITEM = none ]]
 do
-  possible_item=$( ls -1 "$PACKING_QUEUE_DIR/" | grep -E '_[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$' | sort | head -n 1 )
+  possible_item=$( ls -1 "$PACKING_QUEUE_DIR/" | grep -E '[0-9]{14}_[a-f0-9]{8}$' | sort | head -n 1 )
   if test -n "${possible_item}"
   then
     echo "Trying to grab $possible_item"
diff --git a/upload-one b/upload-one
index a2847cc..b8f867c 100755
--- a/upload-one
+++ b/upload-one
@@ -40,7 +40,7 @@ mayicontinue
 ITEM=none
 while [[ $ITEM = none ]]
 do
-  possible_item=$( ls -1 "$UPLOAD_QUEUE_DIR" | grep -E '_[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}$' | sort | head -n 1 )
+  possible_item=$( ls -1 "$UPLOAD_QUEUE_DIR" | grep -E '[0-9]{14}_[a-f0-9]{8}$' | sort | head -n 1 )
   if test -n "${possible_item}"
   then
     echo "Trying to grab $possible_item"