More work to integrate skimage with rebaseline tools.

tools/skimage_main.cpp:
Add the ability to write the results to checksum based filenames,
much like GM uses. This will allow using the skpdiff server to
rebaseline images.
Write the keys in the JSON file as <original image>_<pref config>.png,
so it matches gm_json.IMAGE_FILENAME_PATTERN. Also replace '_' with
'-' in the original file name, to avoid confusing the pattern matcher.
The '_' to '-' replacement also happens on the output filename.
Read the keys in a similar manner.
In make_outname, no longer remove a suffix. This fixes a bug where
subset decoding writes multiple subsets to the same file.

tools/rebaseline.py:
Since the filenames written to json files now match
gm_json.IMAGE_FILENAME_PATTERN, enable the option to match based
on configs/tests when rebaselining skimage.

test json files:
Update to match the new format of output.

gm/gm_expectations:
Add a constructor that takes a BitmapAndDigest as input.

tools/tests/skimage_self_test.py:
Test that reading the expectations file just created by skimage with
the same file actually compares to the original file (rather than just
succeeding because expectations were missing).

Change the expectations files to match the new format.

Will require a buildbot change to use the new flag: https://codereview.chromium.org/27389002/

BUG=1466
R=epoger@google.com

Review URL: https://codereview.chromium.org/26297004

git-svn-id: http://skia.googlecode.com/svn/trunk@11902 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json b/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
index 2f885a8..9db60ed 100644
--- a/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json b/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
index 2f885a8..9db60ed 100644
--- a/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/skimage/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json b/expectations/skimage/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
index 2f885a8..675cfce 100644
--- a/expectations/skimage/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
+++ b/expectations/skimage/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json b/expectations/skimage/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
index 2f885a8..675cfce 100644
--- a/expectations/skimage/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
+++ b/expectations/skimage/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json b/expectations/skimage/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
index 2f885a8..675cfce 100644
--- a/expectations/skimage/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/skimage/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json b/expectations/skimage/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
index 2f885a8..675cfce 100644
--- a/expectations/skimage/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/skimage/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json b/expectations/skimage/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
index 2f885a8..9db60ed 100644
--- a/expectations/skimage/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
+++ b/expectations/skimage/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json b/expectations/skimage/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
index 2f885a8..9db60ed 100644
--- a/expectations/skimage/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
+++ b/expectations/skimage/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json b/expectations/skimage/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
index 2f885a8..9db60ed 100644
--- a/expectations/skimage/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
+++ b/expectations/skimage/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json b/expectations/skimage/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
index 2f885a8..675cfce 100644
--- a/expectations/skimage/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
+++ b/expectations/skimage/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json b/expectations/skimage/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
index 56dad3c..b844b59 100644
--- a/expectations/skimage/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/skimage/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json b/expectations/skimage/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
index 56dad3c..44066c8 100644
--- a/expectations/skimage/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/skimage/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -312,7 +312,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -330,7 +330,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -339,7 +339,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -348,7 +348,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -375,7 +375,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -384,7 +384,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -402,7 +402,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -411,7 +411,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -420,7 +420,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -438,7 +438,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -447,7 +447,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -474,7 +474,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -483,7 +483,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -492,7 +492,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -510,7 +510,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -519,7 +519,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -528,7 +528,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -555,7 +555,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -564,7 +564,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -582,7 +582,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -591,7 +591,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -600,7 +600,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -618,7 +618,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -627,7 +627,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -654,7 +654,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -663,7 +663,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -672,7 +672,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -690,7 +690,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -699,7 +699,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -708,7 +708,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -735,7 +735,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -744,7 +744,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -762,7 +762,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -771,7 +771,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -780,7 +780,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -798,7 +798,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -807,7 +807,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -879,7 +879,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -888,7 +888,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -906,7 +906,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -915,7 +915,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -924,7 +924,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -942,7 +942,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -951,7 +951,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -978,7 +978,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -987,7 +987,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -996,7 +996,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1014,7 +1014,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1023,7 +1023,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1032,7 +1032,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1059,7 +1059,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1068,7 +1068,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1077,7 +1077,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1095,7 +1095,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1104,7 +1104,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1113,7 +1113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1131,7 +1131,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1149,7 +1149,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json b/expectations/skimage/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
index 1ebfb63..c883c82 100644
--- a/expectations/skimage/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
+++ b/expectations/skimage/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -16,7 +16,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -26,7 +26,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -36,7 +36,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -46,7 +46,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -56,7 +56,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -66,7 +66,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -76,7 +76,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -86,7 +86,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -106,7 +106,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -116,7 +116,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -126,7 +126,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -136,7 +136,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -146,7 +146,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -156,7 +156,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -166,7 +166,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -176,7 +176,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -196,7 +196,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -206,7 +206,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -216,7 +216,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -226,7 +226,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -236,7 +236,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -246,7 +246,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -256,7 +256,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -266,7 +266,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -286,7 +286,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -296,7 +296,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -306,7 +306,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -316,7 +316,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -326,7 +326,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -336,7 +336,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -346,7 +346,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -356,7 +356,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -376,7 +376,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -386,7 +386,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -396,7 +396,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -406,7 +406,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -416,7 +416,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -426,7 +426,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -436,7 +436,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -446,7 +446,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -466,7 +466,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -476,7 +476,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -486,7 +486,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -496,7 +496,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -506,7 +506,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -516,7 +516,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -526,7 +526,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -536,7 +536,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -556,7 +556,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -566,7 +566,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -576,7 +576,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -586,7 +586,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -596,7 +596,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -606,7 +606,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -616,7 +616,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -626,7 +626,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -646,7 +646,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -656,7 +656,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -666,7 +666,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -676,7 +676,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -686,7 +686,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -696,7 +696,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -706,7 +706,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -716,7 +716,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -736,7 +736,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -746,7 +746,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -756,7 +756,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -766,7 +766,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -776,7 +776,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -786,7 +786,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -796,7 +796,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -806,7 +806,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -880,7 +880,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -890,7 +890,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -900,7 +900,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -910,7 +910,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -920,7 +920,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -930,7 +930,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -940,7 +940,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -950,7 +950,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -970,7 +970,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -980,7 +980,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -990,7 +990,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1000,7 +1000,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1010,7 +1010,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1020,7 +1020,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1030,7 +1030,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1040,7 +1040,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1060,7 +1060,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1070,7 +1070,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1080,7 +1080,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1090,7 +1090,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1100,7 +1100,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1110,7 +1110,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1120,7 +1120,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1130,7 +1130,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1150,7 +1150,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1160,7 +1160,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1170,7 +1170,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1179,7 +1179,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1188,7 +1188,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1197,7 +1197,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1206,7 +1206,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1215,7 +1215,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1224,7 +1224,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1234,7 +1234,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1244,7 +1244,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1254,7 +1254,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1264,7 +1264,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1274,7 +1274,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json b/expectations/skimage/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
index 1ebfb63..1100dc9 100644
--- a/expectations/skimage/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
+++ b/expectations/skimage/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -16,7 +16,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "01_original.jpg_[1283,728,1670,749]": {
+    "01-original-jpg-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -26,7 +26,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "01_original.jpg_[1291,725,1774,1184]": {
+    "01-original-jpg-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -36,7 +36,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "01_original.jpg_[1767,337,1818,684]": {
+    "01-original-jpg-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -46,7 +46,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "01_original.jpg_[306,297,863,724]": {
+    "01-original-jpg-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -56,7 +56,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "01_original.jpg_[514,137,879,980]": {
+    "01-original-jpg-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -66,7 +66,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -76,7 +76,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG_[1283,728,1670,749]": {
+    "02-empty-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -86,7 +86,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG_[1291,725,1774,1184]": {
+    "02-empty-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG_[1767,337,1818,684]": {
+    "02-empty-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -106,7 +106,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG_[306,297,863,724]": {
+    "02-empty-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -116,7 +116,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "02_empty_filter.JPG_[514,137,879,980]": {
+    "02-empty-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -126,7 +126,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -136,7 +136,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG_[1283,728,1670,749]": {
+    "03-none-filter-JPG-[1283,728,1670,749]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -146,7 +146,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG_[1291,725,1774,1184]": {
+    "03-none-filter-JPG-[1291,725,1774,1184]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -156,7 +156,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG_[1767,337,1818,684]": {
+    "03-none-filter-JPG-[1767,337,1818,684]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -166,7 +166,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG_[306,297,863,724]": {
+    "03-none-filter-JPG-[306,297,863,724]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -176,7 +176,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "03_none_filter.JPG_[514,137,879,980]": {
+    "03-none-filter-JPG-[514,137,879,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -196,7 +196,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -206,7 +206,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -216,7 +216,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -226,7 +226,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -236,7 +236,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -246,7 +246,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -256,7 +256,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -266,7 +266,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg_[381,433,494,496]": {
+    "CMYK-jpg-[381,433,494,496]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg_[43,296,68,433]": {
+    "CMYK-jpg-[43,296,68,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -286,7 +286,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg_[46,148,293,209]": {
+    "CMYK-jpg-[46,148,293,209]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -296,7 +296,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg_[554,68,627,409]": {
+    "CMYK-jpg-[554,68,627,409]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -306,7 +306,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "CMYK.jpg_[7,149,504,316]": {
+    "CMYK-jpg-[7,149,504,316]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -316,7 +316,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -326,7 +326,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg_[122,128,147,160]": {
+    "Lower-Left-jpg-[122,128,147,160]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -336,7 +336,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg_[123,2,137,55]": {
+    "Lower-Left-jpg-[123,2,137,55]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -346,7 +346,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg_[183,8,204,124]": {
+    "Lower-Left-jpg-[183,8,204,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -356,7 +356,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg_[82,106,255,166]": {
+    "Lower-Left-jpg-[82,106,255,166]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -366,7 +366,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Left.jpg_[93,178,184,182]": {
+    "Lower-Left-jpg-[93,178,184,182]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -376,7 +376,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -386,7 +386,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg_[142,56,255,189]": {
+    "Lower-Right-jpg-[142,56,255,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -396,7 +396,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg_[17,52,133,57]": {
+    "Lower-Right-jpg-[17,52,133,57]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -406,7 +406,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg_[182,17,223,92]": {
+    "Lower-Right-jpg-[182,17,223,92]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -416,7 +416,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg_[63,84,206,121]": {
+    "Lower-Right-jpg-[63,84,206,121]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -426,7 +426,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Lower_Right.jpg_[86,53,213,176]": {
+    "Lower-Right-jpg-[86,53,213,176]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -436,7 +436,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -446,7 +446,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg_[2502,197,3999,706]": {
+    "PANO-20121023-214540-jpg-[2502,197,3999,706]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -456,7 +456,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg_[3153,152,3336,413]": {
+    "PANO-20121023-214540-jpg-[3153,152,3336,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -466,7 +466,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg_[3166,50,4165,115]": {
+    "PANO-20121023-214540-jpg-[3166,50,4165,115]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -476,7 +476,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg_[526,283,7495,788]": {
+    "PANO-20121023-214540-jpg-[526,283,7495,788]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -486,7 +486,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "PANO_20121023_214540.jpg_[656,164,3947,413]": {
+    "PANO-20121023-214540-jpg-[656,164,3947,413]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -496,7 +496,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -506,7 +506,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -516,7 +516,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg_[122,29,147,60]": {
+    "Upper-Left-jpg-[122,29,147,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -526,7 +526,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg_[123,16,137,189]": {
+    "Upper-Left-jpg-[123,16,137,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -536,7 +536,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg_[183,77,204,180]": {
+    "Upper-Left-jpg-[183,77,204,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -546,7 +546,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg_[82,116,255,149]": {
+    "Upper-Left-jpg-[82,116,255,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -556,7 +556,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Left.jpg_[93,33,184,112]": {
+    "Upper-Left-jpg-[93,33,184,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -566,7 +566,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -576,7 +576,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg_[142,29,255,60]": {
+    "Upper-Right-jpg-[142,29,255,60]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -586,7 +586,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg_[17,16,133,189]": {
+    "Upper-Right-jpg-[17,16,133,189]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -596,7 +596,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg_[182,33,223,112]": {
+    "Upper-Right-jpg-[182,33,223,112]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -606,7 +606,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg_[63,77,206,180]": {
+    "Upper-Right-jpg-[63,77,206,180]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -616,7 +616,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "Upper_Right.jpg_[86,116,213,149]": {
+    "Upper-Right-jpg-[86,116,213,149]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -626,7 +626,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -636,7 +636,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg_[223,697,962,884]": {
+    "art-jpg-[223,697,962,884]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -646,7 +646,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg_[507,565,830,784]": {
+    "art-jpg-[507,565,830,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -656,7 +656,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg_[547,29,822,808]": {
+    "art-jpg-[547,29,822,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -666,7 +666,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg_[634,124,743,737]": {
+    "art-jpg-[634,124,743,737]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -676,7 +676,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "art.jpg_[783,937,1154,980]": {
+    "art-jpg-[783,937,1154,980]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -686,7 +686,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -696,7 +696,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg_[267,565,750,784]": {
+    "baseline-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -706,7 +706,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg_[514,260,623,697]": {
+    "baseline-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -716,7 +716,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg_[562,884,863,937]": {
+    "baseline-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -726,7 +726,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg_[743,497,794,604]": {
+    "baseline-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -736,7 +736,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -746,7 +746,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -756,7 +756,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg_[267,565,750,784]": {
+    "baseline-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -766,7 +766,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg_[514,260,623,697]": {
+    "baseline-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -776,7 +776,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg_[562,884,863,937]": {
+    "baseline-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -786,7 +786,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg_[743,497,794,604]": {
+    "baseline-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -796,7 +796,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "baseline_restart_jpeg.jpg_[902,749,1027,808]": {
+    "baseline-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -806,7 +806,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -816,7 +816,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "desk_yahoonews_0.jpg_[267,80,750,373]": {
+    "desk-yahoonews-0-jpg-[267,80,750,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -834,7 +834,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "desk_yahoonews_0.jpg_[514,132,623,377]": {
+    "desk-yahoonews-0-jpg-[514,132,623,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -843,7 +843,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "desk_yahoonews_0.jpg_[562,745,863,820]": {
+    "desk-yahoonews-0-jpg-[562,745,863,820]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -852,7 +852,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "desk_yahoonews_0.jpg_[743,348,794,945]": {
+    "desk-yahoonews-0-jpg-[743,348,794,945]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "desk_yahoonews_0.jpg_[902,45,1027,936]": {
+    "desk-yahoonews-0-jpg-[902,45,1027,936]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -870,7 +870,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -880,7 +880,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "kokteylogo.png_[26,0,57,17]": {
+    "kokteylogo-png-[26,0,57,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -890,7 +890,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "kokteylogo.png_[26,4,45,5]": {
+    "kokteylogo-png-[26,4,45,5]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -900,7 +900,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "kokteylogo.png_[27,8,36,9]": {
+    "kokteylogo-png-[27,8,36,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -910,7 +910,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "kokteylogo.png_[38,4,53,17]": {
+    "kokteylogo-png-[38,4,53,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -920,7 +920,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "kokteylogo.png_[69,4,71,17]": {
+    "kokteylogo-png-[69,4,71,17]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -930,7 +930,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -940,7 +940,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png_[134,45,259,424]": {
+    "photo-jpg-png-[134,45,259,424]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -950,7 +950,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png_[2,132,367,377]": {
+    "photo-jpg-png-[2,132,367,377]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -960,7 +960,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png_[231,348,282,433]": {
+    "photo-jpg-png-[231,348,282,433]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -970,7 +970,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png_[238,80,267,373]": {
+    "photo-jpg-png-[238,80,267,373]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -980,7 +980,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "photo.jpg.png_[306,233,351,308]": {
+    "photo-jpg-png-[306,233,351,308]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -990,7 +990,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1000,7 +1000,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png_[103,17,154,124]": {
+    "png-test-png-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1010,7 +1010,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png_[110,85,267,304]": {
+    "png-test-png-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1020,7 +1020,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png_[223,404,562,457]": {
+    "png-test-png-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1030,7 +1030,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png_[262,269,387,328]": {
+    "png-test-png-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1040,7 +1040,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "png_test.png_[514,217,623,260]": {
+    "png-test-png-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1050,7 +1050,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1060,7 +1060,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg_[267,565,750,784]": {
+    "progressive-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1070,7 +1070,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg_[514,260,623,697]": {
+    "progressive-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1080,7 +1080,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg_[562,884,863,937]": {
+    "progressive-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1090,7 +1090,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg_[743,497,794,604]": {
+    "progressive-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1100,7 +1100,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1110,7 +1110,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1120,7 +1120,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg_[267,565,750,784]": {
+    "progressive-restart-jpeg-jpg-[267,565,750,784]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1130,7 +1130,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg_[514,260,623,697]": {
+    "progressive-restart-jpeg-jpg-[514,260,623,697]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1140,7 +1140,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg_[562,884,863,937]": {
+    "progressive-restart-jpeg-jpg-[562,884,863,937]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1150,7 +1150,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg_[743,497,794,604]": {
+    "progressive-restart-jpeg-jpg-[743,497,794,604]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1160,7 +1160,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "progressive_restart_jpeg.jpg_[902,749,1027,808]": {
+    "progressive-restart-jpeg-jpg-[902,749,1027,808]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1170,7 +1170,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1179,7 +1179,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "tabl_mozilla_0.jpg_[187,29,1065,403]": {
+    "tabl-mozilla-0-jpg-[187,29,1065,403]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1188,7 +1188,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "tabl_mozilla_0.jpg_[194,100,951,214]": {
+    "tabl-mozilla-0-jpg-[194,100,951,214]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1197,7 +1197,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "tabl_mozilla_0.jpg_[443,259,934,572]": {
+    "tabl-mozilla-0-jpg-[443,259,934,572]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1206,7 +1206,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "tabl_mozilla_0.jpg_[567,322,737,425]": {
+    "tabl-mozilla-0-jpg-[567,322,737,425]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1215,7 +1215,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "tabl_mozilla_0.jpg_[809,359,1249,532]": {
+    "tabl-mozilla-0-jpg-[809,359,1249,532]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1224,7 +1224,7 @@
       ], 
       "ignore-failure": true
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1234,7 +1234,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1244,7 +1244,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1254,7 +1254,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1264,7 +1264,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1274,7 +1274,7 @@
       "ignore-failure": false, 
       "reviewed-by-human": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json b/expectations/skimage/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
+++ b/expectations/skimage/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json b/expectations/skimage/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
+++ b/expectations/skimage/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json b/expectations/skimage/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
index 4b99a96..bce1a1d 100644
--- a/expectations/skimage/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/skimage/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json b/expectations/skimage/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/skimage/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json b/expectations/skimage/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
+++ b/expectations/skimage/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json b/expectations/skimage/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
index 4b99a96..bce1a1d 100644
--- a/expectations/skimage/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
+++ b/expectations/skimage/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index 8602004..96a3b28 100644
--- a/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index 8602004..53597e1 100644
--- a/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 8602004..96a3b28 100644
--- a/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index 8602004..96a3b28 100644
--- a/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/skimage/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index 8602004..53597e1 100644
--- a/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index 8602004..96a3b28 100644
--- a/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 8602004..96a3b28 100644
--- a/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index 8602004..53597e1 100644
--- a/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/skimage/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index 8602004..53597e1 100644
--- a/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index 8602004..96a3b28 100644
--- a/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 8602004..96a3b28 100644
--- a/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index 8602004..96a3b28 100644
--- a/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/skimage/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json b/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
+++ b/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json b/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
+++ b/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json b/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
+++ b/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json b/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
+++ b/expectations/skimage/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Ubuntu12-ShuttleA-HD2000-x86_64-Release-Valgrind/expected-results.json b/expectations/skimage/Test-Ubuntu12-ShuttleA-HD2000-x86_64-Release-Valgrind/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-Ubuntu12-ShuttleA-HD2000-x86_64-Release-Valgrind/expected-results.json
+++ b/expectations/skimage/Test-Ubuntu12-ShuttleA-HD2000-x86_64-Release-Valgrind/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json b/expectations/skimage/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
index 4b99a96..eb303c4 100644
--- a/expectations/skimage/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
+++ b/expectations/skimage/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json b/expectations/skimage/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
index 4b99a96..bce1a1d 100644
--- a/expectations/skimage/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
+++ b/expectations/skimage/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
+++ b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
+++ b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
index 4b99a96..bce1a1d 100644
--- a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
+++ b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
index 4b99a96..bce1a1d 100644
--- a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
+++ b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
index 4b99a96..bce1a1d 100644
--- a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]-8888-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
+++ b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
index 4b99a96..4c3122b 100644
--- a/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
+++ b/expectations/skimage/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
@@ -6,7 +6,7 @@
     "succeeded": null
   }, 
   "expected-results": {
-    "01_original.jpg": {
+    "01-original-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -15,7 +15,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "02_empty_filter.JPG": {
+    "02-empty-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -24,7 +24,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "03_none_filter.JPG": {
+    "03-none-filter-JPG_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "1.bmp": {
+    "1-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -42,7 +42,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp": {
+    "5-sm-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -51,7 +51,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[103,149,154,207]": {
+    "5-sm-webp-[103,149,154,207]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -60,7 +60,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[110,45,267,119]": {
+    "5-sm-webp-[110,45,267,119]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[194,120,303,142]": {
+    "5-sm-webp-[194,120,303,142]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -78,7 +78,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[223,42,242,84]": {
+    "5-sm-webp-[223,42,242,84]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -87,7 +87,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "5.sm.webp_[67,3,262,9]": {
+    "5-sm-webp-[67,3,262,9]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -96,7 +96,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "CMYK.jpg": {
+    "CMYK-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Left.jpg": {
+    "Lower-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -114,7 +114,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Lower_Right.jpg": {
+    "Lower-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -123,7 +123,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "PANO_20121023_214540.jpg": {
+    "PANO-20121023-214540-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -132,7 +132,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Softskin-Series-Folder-Folder-TV-DEXTER-2.ico": {
+    "Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Left.jpg": {
+    "Upper-Left-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -150,7 +150,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "Upper_Right.jpg": {
+    "Upper-Right-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -159,7 +159,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "art.jpg": {
+    "art-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -168,7 +168,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_jpeg.jpg": {
+    "baseline-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "baseline_restart_jpeg.jpg": {
+    "baseline-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -186,7 +186,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bmp_test.bmp": {
+    "bmp-test-bmp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -195,7 +195,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "desk_yahoonews_0.jpg": {
+    "desk-yahoonews-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -204,7 +204,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "kokteylogo.png": {
+    "kokteylogo-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "photo.jpg.png": {
+    "photo-jpg-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -222,7 +222,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "png_test.png": {
+    "png-test-png_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -231,7 +231,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_jpeg.jpg": {
+    "progressive-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -240,7 +240,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "progressive_restart_jpeg.jpg": {
+    "progressive-restart-jpeg-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tabl_mozilla_0.jpg": {
+    "tabl-mozilla-0-jpg_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -258,7 +258,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp": {
+    "webp-test-webp_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -267,7 +267,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[103,17,154,124]": {
+    "webp-test-webp-[103,17,154,124]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -276,7 +276,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[110,85,267,304]": {
+    "webp-test-webp-[110,85,267,304]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[223,404,562,457]": {
+    "webp-test-webp-[223,404,562,457]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -294,7 +294,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[262,269,387,328]": {
+    "webp-test-webp-[262,269,387,328]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -303,7 +303,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "webp_test.webp_[514,217,623,260]": {
+    "webp-test-webp-[514,217,623,260]_8888.png" : {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/gm/gm_expectations.cpp b/gm/gm_expectations.cpp
index 828e9f8..8f04c28 100644
--- a/gm/gm_expectations.cpp
+++ b/gm/gm_expectations.cpp
@@ -141,6 +141,12 @@
         fAllowedResultDigests.push_back(GmResultDigest(bitmap));
     }
 
+    Expectations::Expectations(const BitmapAndDigest& bitmapAndDigest) {
+        fBitmap = bitmapAndDigest.fBitmap;
+        fIgnoreFailure = false;
+        fAllowedResultDigests.push_back(bitmapAndDigest.fDigest);
+    }
+
     Expectations::Expectations(Json::Value jsonElement) {
         if (jsonElement.empty()) {
             fIgnoreFailure = kDefaultIgnoreFailure;
diff --git a/gm/gm_expectations.h b/gm/gm_expectations.h
index 401af0d..5ff009e 100644
--- a/gm/gm_expectations.h
+++ b/gm/gm_expectations.h
@@ -116,7 +116,12 @@
          * Expect exactly one image (appropriate for the case when we
          * are comparing against a single PNG file).
          */
-        Expectations(const SkBitmap& bitmap, bool ignoreFailure=kDefaultIgnoreFailure);
+        explicit Expectations(const SkBitmap& bitmap, bool ignoreFailure=kDefaultIgnoreFailure);
+
+        /**
+         * Expect exactly one image, whose digest has already been computed.
+         */
+        explicit Expectations(const BitmapAndDigest& bitmapAndDigest);
 
         /**
          * Create Expectations from a JSON element as found within the
diff --git a/tools/rebaseline.py b/tools/rebaseline.py
index 44f9c8b..187712d 100755
--- a/tools/rebaseline.py
+++ b/tools/rebaseline.py
@@ -388,8 +388,7 @@
                     help=('which configurations to rebaseline, e.g. '
                           '"--configs 565 8888", as a filter over the full set '
                           'of results in ACTUALS_FILENAME; if unspecified, '
-                          'rebaseline *all* configs that are available. '
-                          'Ignored if SKIMAGE is True.'))
+                          'rebaseline *all* configs that are available.'))
 parser.add_argument('--expectations-filename',
                     help=('filename (under EXPECTATIONS_ROOT) to read '
                           'current expectations from, and to write new '
@@ -422,7 +421,7 @@
                           '"--tests aaclip bigmatrix", as a filter over the '
                           'full set of results in ACTUALS_FILENAME; if '
                           'unspecified, rebaseline *all* tests that are '
-                          'available. Ignored if SKIMAGE is True.'))
+                          'available.'))
 parser.add_argument('--unreviewed', action='store_true',
                     help=('mark all expectations modified by this run as '
                           '"%s": False' %
@@ -454,9 +453,6 @@
     args.actuals_base_url = gm_json.SKIMAGE_ACTUALS_BASE_URL
   if args.expectations_root == parser.get_default('expectations_root'):
     args.expectations_root = gm_json.SKIMAGE_EXPECTATIONS_ROOT
-  # Also ignore TESTS and CONFIGS
-  args.tests = None
-  args.configs = None
 for builder in builders:
   if not builder in TEST_BUILDERS:
     raise Exception(('unrecognized builder "%s"; ' +
diff --git a/tools/skimage_main.cpp b/tools/skimage_main.cpp
index 5b8f095..f5a2b3d 100644
--- a/tools/skimage_main.cpp
+++ b/tools/skimage_main.cpp
@@ -31,6 +31,8 @@
 DEFINE_int32(sampleSize, 1, "Set the sampleSize for decoding.");
 DEFINE_bool(skip, false, "Skip writing zeroes.");
 DEFINE_bool(testSubsetDecoding, true, "Test decoding subsets of images.");
+DEFINE_bool(writeChecksumBasedFilenames, false,  "When writing out actual images, use checksum-"
+            "based filenames, as rebaseline.py will use when downloading them from Google Storage");
 DEFINE_string2(writePath, w, "",  "Write rendered images into this directory.");
 
 struct Format {
@@ -80,15 +82,7 @@
                          const char suffix[]) {
     SkString basename = SkOSPath::SkBasename(src);
     dst->set(SkOSPath::SkPathJoin(outDir, basename.c_str()));
-    if (!dst->endsWith(suffix)) {
-        const char* cstyleDst = dst->c_str();
-        const char* dot = strrchr(cstyleDst, '.');
-        if (dot != NULL) {
-            int32_t index = SkToS32(dot - cstyleDst);
-            dst->remove(index, dst->size() - index);
-        }
-        dst->append(suffix);
-    }
+    dst->append(suffix);
 }
 
 // Store the names of the filenames to report later which ones failed, succeeded, and were
@@ -129,8 +123,44 @@
 // previously written using createExpectationsPath.
 SkAutoTUnref<skiagm::JsonExpectationsSource> gJsonExpectations;
 
-static bool write_bitmap(const char outName[], const SkBitmap& bm) {
-    if (SkImageEncoder::EncodeFile(outName, bm, SkImageEncoder::kPNG_Type, 100)) {
+/**
+ *  Encode the bitmap to a file, written one of two ways, depending on
+ *  FLAGS_writeChecksumBasedFilenames. If true, the final image will be
+ *  written to:
+ *      outDir/hashType/src/digestValue.png
+ *  If false, the final image will be written out to:
+ *      outDir/src.png
+ *  The function returns whether the file was successfully written.
+ */
+static bool write_bitmap(const char outDir[], const char src[],
+                         const skiagm::BitmapAndDigest& bitmapAndDigest) {
+    SkString filename;
+    if (FLAGS_writeChecksumBasedFilenames) {
+        // First create the directory for the hashtype.
+        const SkString hashType = bitmapAndDigest.fDigest.getHashType();
+        const SkString hashDir = SkOSPath::SkPathJoin(outDir, hashType.c_str());
+        if (!sk_mkdir(hashDir.c_str())) {
+            return false;
+        }
+
+        // Now create the name of the folder specific to this image.
+        SkString basename = SkOSPath::SkBasename(src);
+        const SkString imageDir = SkOSPath::SkPathJoin(hashDir.c_str(), basename.c_str());
+        if (!sk_mkdir(imageDir.c_str())) {
+            return false;
+        }
+
+        // Name the file <digest>.png
+        SkString checksumBasedName = bitmapAndDigest.fDigest.getDigestValue();
+        checksumBasedName.append(".png");
+
+        filename = SkOSPath::SkPathJoin(imageDir.c_str(), checksumBasedName.c_str());
+    } else {
+        make_outname(&filename, outDir, src, ".png");
+    }
+
+    const SkBitmap& bm = bitmapAndDigest.fBitmap;
+    if (SkImageEncoder::EncodeFile(filename.c_str(), bm, SkImageEncoder::kPNG_Type, 100)) {
         return true;
     }
 
@@ -145,7 +175,7 @@
     if (!bm.copyTo(&bm8888, SkBitmap::kARGB_8888_Config)) {
         return false;
     }
-    return SkImageEncoder::EncodeFile(outName, bm8888, SkImageEncoder::kPNG_Type, 100);
+    return SkImageEncoder::EncodeFile(filename.c_str(), bm8888, SkImageEncoder::kPNG_Type, 100);
 }
 
 /**
@@ -189,27 +219,47 @@
     return rect;
 }
 
+/**
+ *  Return a string which includes the name of the file and the preferred config,
+ *  as specified by "--config". The resulting string will match the pattern of
+ *  gm_json.py's IMAGE_FILENAME_PATTERN: "filename_config.png"
+ */
+static SkString create_json_key(const char* filename) {
+    SkASSERT(FLAGS_config.count() == 1);
+    return SkStringPrintf("%s_%s.png", filename, FLAGS_config[0]);
+}
+
 // Stored expectations to be written to a file if createExpectationsPath is specified.
 static Json::Value gExpectationsToWrite;
 
 /**
- *  If expectations are to be recorded, record the bitmap expectations into global
+ *  If expectations are to be recorded, record the bitmap expectations into the global
  *  expectations array.
+ *  As is the case with reading expectations, the key used will combine the filename
+ *  parameter with the preferred config, as specified by "--config", matching the
+ *  pattern of gm_json.py's IMAGE_FILENAME_PATTERN: "filename_config.png"
  */
-static void write_expectations(const SkBitmap& bitmap, const char* filename) {
+static void write_expectations(const skiagm::BitmapAndDigest& bitmapAndDigest,
+                               const char* filename) {
+    const SkString name_config = create_json_key(filename);
     if (!FLAGS_createExpectationsPath.isEmpty()) {
         // Creates an Expectations object, and add it to the list to write.
-        skiagm::Expectations expectation(bitmap);
+        skiagm::Expectations expectation(bitmapAndDigest);
         Json::Value value = expectation.asJsonValue();
-        gExpectationsToWrite[filename] = value;
+        gExpectationsToWrite[name_config.c_str()] = value;
     }
 }
 
 /**
- *  Compare against an expectation for this filename, if there is one.
- *  @param digest GmResultDigest, computed from the decoded bitmap, to compare to the
- *          expectation.
- *  @param filename String used to find the expected value.
+ *  If --readExpectationsPath is set, compare this bitmap to the json expectations
+ *  provided.
+ *
+ *  @param digest GmResultDigest, computed from the decoded bitmap, to compare to
+ *         the existing expectation.
+ *  @param filename String used to find the expected value. Will be combined with the
+ *         preferred config, as specified by "--config", to match the pattern of
+ *         gm_json.py's IMAGE_FILENAME_PATTERN: "filename_config.png". The resulting
+ *         key will be used to find the proper expectations.
  *  @param failureArray Array to add a failure message to on failure.
  *  @param missingArray Array to add failure message to when missing image
  *          expectation.
@@ -228,6 +278,11 @@
                                                  SkTArray<SkString, false>* failureArray,
                                                  SkTArray<SkString, false>* missingArray,
                                                  SkTArray<SkString, false>* ignoreArray) {
+    // For both writing and reading, the key for this entry will include the name
+    // of the file and the pref config, matching the pattern of gm_json.py's
+    // IMAGE_FILENAME_PATTERN: "name_config.png"
+    const SkString name_config = create_json_key(filename);
+
     if (!digest.isValid()) {
         if (failureArray != NULL) {
             failureArray->push_back().printf("decoded %s, but could not create a GmResultDigest.",
@@ -240,7 +295,7 @@
         return false;
     }
 
-    skiagm::Expectations jsExpectation = gJsonExpectations->get(filename);
+    skiagm::Expectations jsExpectation = gJsonExpectations->get(name_config.c_str());
     if (jsExpectation.empty()) {
         if (missingArray != NULL) {
             missingArray->push_back().printf("decoded %s, but could not find expectation.",
@@ -266,72 +321,83 @@
 
 /**
  *  Helper function to write a bitmap subset to a file. Only called if subsets were created
- *  and a writePath was provided. Creates a subdirectory called 'subsets' and writes a PNG to
- *  that directory. Also creates a subdirectory called 'extracted' and writes a bitmap created
- *  using extractSubset to a PNG in that directory. Both files will represent the same
- *  subrectangle and have the same name for comparison.
+ *  and a writePath was provided. Behaves differently depending on
+ *  FLAGS_writeChecksumBasedFilenames. If true:
+ *      Writes the image to a PNG file named according to the digest hash, as described in
+ *      write_bitmap.
+ *  If false:
+ *      Creates a subdirectory called 'subsets' and writes a PNG to that directory. Also
+ *      creates a subdirectory called 'extracted' and writes a bitmap created using
+ *      extractSubset to a PNG in that directory. Both files will represent the same
+ *      subrectangle and have the same name for convenient comparison. In this case, the
+ *      digest is ignored.
+ *
  *  @param writePath Parent directory to hold the folders for the PNG files to write. Must
  *      not be NULL.
- *  @param filename Basename of the original file. Used to name the new files. Must not be
- *      NULL.
- *  @param subsetDim String representing the dimensions of the subset. Used to name the new
- *      files. Must not be NULL.
- *  @param bitmapFromDecodeSubset Pointer to SkBitmap created by SkImageDecoder::DecodeSubset,
- *      using rect as the area to decode.
+ *  @param subsetName Basename of the original file, with the dimensions of the subset tacked
+ *      on. Used to name the new file/folder.
+ *  @param bitmapAndDigestFromDecodeSubset SkBitmap (with digest) created by
+ *      SkImageDecoder::DecodeSubset, using rect as the area to decode.
  *  @param rect Rectangle of the area decoded into bitmapFromDecodeSubset. Used to call
  *      extractSubset on originalBitmap to create a bitmap with the same dimensions/pixels as
  *      bitmapFromDecodeSubset (assuming decodeSubset worked properly).
  *  @param originalBitmap SkBitmap decoded from the same stream as bitmapFromDecodeSubset,
  *      using SkImageDecoder::decode to get the entire image. Used to create a PNG file for
- *      comparison to the PNG created by bitmapFromDecodeSubset.
+ *      comparison to the PNG created by bitmapAndDigestFromDecodeSubset's bitmap.
  *  @return bool Whether the function succeeded at drawing the decoded subset and the extracted
  *      subset to files.
  */
-static bool write_subset(const char* writePath, const char* filename, const char* subsetDim,
-                          SkBitmap* bitmapFromDecodeSubset, SkIRect rect,
-                          const SkBitmap& originalBitmap) {
+static bool write_subset(const char* writePath, const SkString& subsetName,
+                          const skiagm::BitmapAndDigest bitmapAndDigestFromDecodeSubset,
+                          SkIRect rect, const SkBitmap& originalBitmap) {
     // All parameters must be valid.
     SkASSERT(writePath != NULL);
-    SkASSERT(filename != NULL);
-    SkASSERT(subsetDim != NULL);
-    SkASSERT(bitmapFromDecodeSubset != NULL);
 
-    // Create a subdirectory to hold the results of decodeSubset.
-    SkString dir = SkOSPath::SkPathJoin(writePath, "subsets");
-    if (!sk_mkdir(dir.c_str())) {
-        gFailedSubsetDecodes.push_back().printf("Successfully decoded %s from %s, but failed to "
-                                                "create a directory to write to.", subsetDim,
-                                                 filename);
-        return false;
+    SkString subsetPath;
+    if (FLAGS_writeChecksumBasedFilenames) {
+        subsetPath.set(writePath);
+    } else {
+        // Create a subdirectory to hold the results of decodeSubset.
+        subsetPath = SkOSPath::SkPathJoin(writePath, "subsets");
+        if (!sk_mkdir(subsetPath.c_str())) {
+            gFailedSubsetDecodes.push_back().printf("Successfully decoded subset %s, but "
+                                                    "failed to create a directory to write to.",
+                                                     subsetName.c_str());
+            return false;
+        }
     }
+    SkAssertResult(write_bitmap(subsetPath.c_str(), subsetName.c_str(),
+                                bitmapAndDigestFromDecodeSubset));
+    gSuccessfulSubsetDecodes.push_back().printf("\twrote %s", subsetName.c_str());
 
-    // Write the subset to a file whose name includes the dimensions.
-    SkString suffix = SkStringPrintf("_%s.png", subsetDim);
-    SkString outPath;
-    make_outname(&outPath, dir.c_str(), filename, suffix.c_str());
-    SkAssertResult(write_bitmap(outPath.c_str(), *bitmapFromDecodeSubset));
-    gSuccessfulSubsetDecodes.push_back().printf("\twrote %s", outPath.c_str());
+    if (!FLAGS_writeChecksumBasedFilenames) {
+        // FIXME: The goal of extracting the subset is for visual comparison/using skdiff/skpdiff.
+        // Currently disabling for writeChecksumBasedFilenames since it will be trickier to
+        // determine which files to compare.
 
-    // Also use extractSubset from the original for visual comparison.
-    // Write the result to a file in a separate subdirectory.
-    SkBitmap extractedSubset;
-    if (!originalBitmap.extractSubset(&extractedSubset, rect)) {
-        gFailedSubsetDecodes.push_back().printf("Successfully decoded %s from %s, but failed to "
-                                                "extract a similar subset for comparison.",
-                                                subsetDim, filename);
-        return false;
+        // Also use extractSubset from the original for visual comparison.
+        // Write the result to a file in a separate subdirectory.
+        SkBitmap extractedSubset;
+        if (!originalBitmap.extractSubset(&extractedSubset, rect)) {
+            gFailedSubsetDecodes.push_back().printf("Successfully decoded subset %s, but failed "
+                                                    "to extract a similar subset for comparison.",
+                                                    subsetName.c_str());
+            return false;
+        }
+
+        SkString dirExtracted = SkOSPath::SkPathJoin(writePath, "extracted");
+        if (!sk_mkdir(dirExtracted.c_str())) {
+            gFailedSubsetDecodes.push_back().printf("Successfully decoded subset%s, but failed "
+                                                    "to create a directory for extractSubset "
+                                                    "comparison.",
+                                                    subsetName.c_str());
+            return false;
+        }
+
+        skiagm::BitmapAndDigest bitmapAndDigestFromExtractSubset(extractedSubset);
+        SkAssertResult(write_bitmap(dirExtracted.c_str(), subsetName.c_str(),
+                                    bitmapAndDigestFromExtractSubset));
     }
-
-    SkString dirExtracted = SkOSPath::SkPathJoin(writePath, "extracted");
-    if (!sk_mkdir(dirExtracted.c_str())) {
-        gFailedSubsetDecodes.push_back().printf("Successfully decoded %s from %s, but failed to "
-                                                "create a directory for extractSubset comparison.",
-                                                subsetDim, filename);
-        return false;
-    }
-
-    make_outname(&outPath, dirExtracted.c_str(), filename, suffix.c_str());
-    SkAssertResult(write_bitmap(outPath.c_str(), extractedSubset));
     return true;
 }
 
@@ -397,6 +463,21 @@
 }
 #endif // defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
 
+/**
+ *  Replace all instances of oldChar with newChar in str.
+ *  TODO: Add this function to SkString and write tests for it.
+ */
+static void replace_char(SkString* str, const char oldChar, const char newChar) {
+    if (NULL == str) {
+        return;
+    }
+    for (size_t i = 0; i < str->size(); ++i) {
+        if (oldChar == str->operator[](i)) {
+            str->operator[](i) = newChar;
+        }
+    }
+}
+
 static void decodeFileAndWrite(const char srcPath[], const SkString* writePath) {
     SkBitmap bitmap;
     SkFILEStream stream(srcPath);
@@ -419,12 +500,18 @@
 
     // Create a string representing just the filename itself, for use in json expectations.
     SkString basename = SkOSPath::SkBasename(srcPath);
+    // Replace '_' with '-', so that the names can fit gm_json.py's IMAGE_FILENAME_PATTERN
+    replace_char(&basename, '_', '-');
+    // Replace '.' with '-', so the output filename can still retain the original file extension,
+    // but still end up with only one '.', which denotes the actual extension of the final file.
+    replace_char(&basename, '.', '-');
     const char* filename = basename.c_str();
 
     if (!codec->decode(&stream, &bitmap, gPrefConfig,
                        SkImageDecoder::kDecodePixels_Mode)) {
         if (NULL != gJsonExpectations.get()) {
-            skiagm::Expectations jsExpectations = gJsonExpectations->get(filename);
+            const SkString name_config = create_json_key(filename);
+            skiagm::Expectations jsExpectations = gJsonExpectations->get(name_config.c_str());
             if (jsExpectations.ignoreFailure()) {
                 // This is a known failure.
                 gKnownFailures.push_back().appendf(
@@ -462,40 +549,34 @@
         }
     }
 
-    skiagm::GmResultDigest digest(bitmap);
-    if (compare_to_expectations_if_necessary(digest, filename,
-                                             &gDecodeFailures,
-                                             &gMissingExpectations,
-                                             &gKnownFailures)) {
+    skiagm::BitmapAndDigest bitmapAndDigest(bitmap);
+    if (compare_to_expectations_if_necessary(bitmapAndDigest.fDigest, filename, &gDecodeFailures,
+                                             &gMissingExpectations, &gKnownFailures)) {
         gSuccessfulDecodes.push_back().printf("%s [%d %d]", srcPath, bitmap.width(),
                                               bitmap.height());
     } else if (!FLAGS_mismatchPath.isEmpty()) {
-        SkString outPath;
-        make_outname(&outPath, FLAGS_mismatchPath[0], srcPath, ".png");
-        if (write_bitmap(outPath.c_str(), bitmap)) {
-            gSuccessfulDecodes.push_back().appendf("\twrote %s", outPath.c_str());
+        if (write_bitmap(FLAGS_mismatchPath[0], filename, bitmapAndDigest)) {
+            gSuccessfulDecodes.push_back().appendf("\twrote %s", filename);
         } else {
-            gEncodeFailures.push_back().set(outPath);
+            gEncodeFailures.push_back().set(filename);
         }
     }
 
 // FIXME: This test could be run on windows/mac once we remove their dependence on
 // getLength. See https://code.google.com/p/skia/issues/detail?id=1570
 #if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
-    test_stream_without_length(srcPath, codec, digest);
+    test_stream_without_length(srcPath, codec, bitmapAndDigest.fDigest);
 #endif
 
     if (writePath != NULL) {
-        SkString outPath;
-        make_outname(&outPath, writePath->c_str(), srcPath, ".png");
-        if (write_bitmap(outPath.c_str(), bitmap)) {
-            gSuccessfulDecodes.push_back().appendf("\twrote %s", outPath.c_str());
+        if (write_bitmap(writePath->c_str(), filename, bitmapAndDigest)) {
+            gSuccessfulDecodes.push_back().appendf("\twrote %s", filename);
         } else {
-            gEncodeFailures.push_back().set(outPath);
+            gEncodeFailures.push_back().set(filename);
         }
     }
 
-    write_expectations(bitmap, filename);
+    write_expectations(bitmapAndDigest, filename);
 
     if (FLAGS_testSubsetDecoding) {
         SkDEBUGCODE(bool couldRewind =) stream.rewind();
@@ -514,9 +595,9 @@
                 SkString subsetDim = SkStringPrintf("[%d,%d,%d,%d]", rect.fLeft, rect.fTop,
                                                     rect.fRight, rect.fBottom);
                 if (codec->decodeSubset(&bitmapFromDecodeSubset, rect, gPrefConfig)) {
-                    SkString subsetName = SkStringPrintf("%s_%s", filename, subsetDim.c_str());
-                    skiagm::GmResultDigest subsetDigest(bitmapFromDecodeSubset);
-                    if (compare_to_expectations_if_necessary(subsetDigest,
+                    SkString subsetName = SkStringPrintf("%s-%s", filename, subsetDim.c_str());
+                    skiagm::BitmapAndDigest subsetBitmapAndDigest(bitmapFromDecodeSubset);
+                    if (compare_to_expectations_if_necessary(subsetBitmapAndDigest.fDigest,
                                                              subsetName.c_str(),
                                                              &gFailedSubsetDecodes,
                                                              &gMissingSubsetExpectations,
@@ -524,14 +605,15 @@
                         gSuccessfulSubsetDecodes.push_back().printf("Decoded subset %s from %s",
                                                               subsetDim.c_str(), srcPath);
                     } else if (!FLAGS_mismatchPath.isEmpty()) {
-                        write_subset(FLAGS_mismatchPath[0], filename, subsetDim.c_str(),
-                                     &bitmapFromDecodeSubset, rect, bitmap);
+                        write_subset(FLAGS_mismatchPath[0], subsetName,
+                                     subsetBitmapAndDigest, rect, bitmap);
                     }
 
-                    write_expectations(bitmapFromDecodeSubset, subsetName.c_str());
+                    write_expectations(subsetBitmapAndDigest, subsetName.c_str());
+
                     if (writePath != NULL) {
-                        write_subset(writePath->c_str(), filename, subsetDim.c_str(),
-                                     &bitmapFromDecodeSubset, rect, bitmap);
+                        write_subset(writePath->c_str(), subsetName,
+                                     subsetBitmapAndDigest, rect, bitmap);
                     }
                 } else {
                     gFailedSubsetDecodes.push_back().printf("Failed to decode region %s from %s",
@@ -587,7 +669,7 @@
         if (writePath != NULL && type != SkImageEncoder::kPNG_Type) {
             // Write the encoded data to a file. Do not write to PNG, which was already written.
             SkString outPath;
-            make_outname(&outPath, writePath->c_str(), srcPath, suffix_for_type(type));
+            make_outname(&outPath, writePath->c_str(), filename, suffix_for_type(type));
             SkFILEWStream file(outPath.c_str());
             if(file.write(data->data(), data->size())) {
                 gSuccessfulDecodes.push_back().appendf("\twrote %s", outPath.c_str());
diff --git a/tools/tests/skimage/input/bad-images/empty-results.json b/tools/tests/skimage/input/bad-images/empty-results.json
index 8ae5610..72a4864 100644
--- a/tools/tests/skimage/input/bad-images/empty-results.json
+++ b/tools/tests/skimage/input/bad-images/empty-results.json
@@ -6,7 +6,7 @@
       "succeeded" : null
    },
    "expected-results" : {
-      "invalid.png" : {
+      "invalid-png_None.png" : {
       }
    }
 }
diff --git a/tools/tests/skimage/input/bad-images/ignore-results.json b/tools/tests/skimage/input/bad-images/ignore-results.json
index 4a0326e..06a1979 100644
--- a/tools/tests/skimage/input/bad-images/ignore-results.json
+++ b/tools/tests/skimage/input/bad-images/ignore-results.json
@@ -6,7 +6,7 @@
       "succeeded" : null
    },
    "expected-results" : {
-      "invalid.png" : {
+      "invalid-png_None.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 8011846386646810712 ]
          ],
diff --git a/tools/tests/skimage/input/bad-images/incorrect-results.json b/tools/tests/skimage/input/bad-images/incorrect-results.json
index 67b8bdb..6ba68e3 100644
--- a/tools/tests/skimage/input/bad-images/incorrect-results.json
+++ b/tools/tests/skimage/input/bad-images/incorrect-results.json
@@ -6,7 +6,7 @@
       "succeeded" : null
    },
    "expected-results" : {
-      "invalid.png" : {
+      "invalid-png_None.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 8011846386646810712 ]
          ],
diff --git a/tools/tests/skimage/input/images-with-known-hashes/ignore-failures.json b/tools/tests/skimage/input/images-with-known-hashes/ignore-failures.json
index a99cd3e..f82ac17 100644
--- a/tools/tests/skimage/input/images-with-known-hashes/ignore-failures.json
+++ b/tools/tests/skimage/input/images-with-known-hashes/ignore-failures.json
@@ -6,7 +6,7 @@
       "succeeded" : null
    },
    "expected-results" : {
-      "1209453360120438698.png" : {
+      "1209453360120438698-png_None.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 1111111111111111111 ]
          ],
diff --git a/tools/tests/skimage/input/images-with-known-hashes/incorrect-results.json b/tools/tests/skimage/input/images-with-known-hashes/incorrect-results.json
index 9cf72c3..9cb7cbd 100644
--- a/tools/tests/skimage/input/images-with-known-hashes/incorrect-results.json
+++ b/tools/tests/skimage/input/images-with-known-hashes/incorrect-results.json
@@ -6,7 +6,7 @@
       "succeeded" : null
    },
    "expected-results" : {
-      "1209453360120438698.png" : {
+      "1209453360120438698-png_None.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 1111111111111111111 ]
          ],
diff --git a/tools/tests/skimage/output-expected/create-expectations/expectations.json b/tools/tests/skimage/output-expected/create-expectations/expectations.json
index c143c1b..0669624 100644
--- a/tools/tests/skimage/output-expected/create-expectations/expectations.json
+++ b/tools/tests/skimage/output-expected/create-expectations/expectations.json
@@ -6,13 +6,13 @@
       "succeeded" : null
    },
    "expected-results" : {
-      "1209453360120438698.png" : {
+      "1209453360120438698-png_None.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 1209453360120438698 ]
          ],
          "ignore-failure" : false
       },
-      "12927999507540085554.png" : {
+      "12927999507540085554-png_None.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 12927999507540085554 ]
          ],
diff --git a/tools/tests/skimage_self_test.py b/tools/tests/skimage_self_test.py
index 6229d6a..8191a9d 100755
--- a/tools/tests/skimage_self_test.py
+++ b/tools/tests/skimage_self_test.py
@@ -69,13 +69,31 @@
 
     # Empty expectations:
     empty_expectations = os.path.join(expectations_dir, "empty-results.json")
-    subprocess.check_call([skimage_binary, "--readPath", invalid_file,
-                           "--readExpectationsPath", empty_expectations])
+    output = subprocess.check_output([skimage_binary, "--readPath", invalid_file,
+                                      "--readExpectationsPath",
+                                      empty_expectations],
+                                     stderr=subprocess.STDOUT)
+    if not "Missing" in output:
+      # Another test (in main()) tests to ensure that "Missing" does not appear
+      # in the output. That test could be passed if the output changed so
+      # "Missing" never appears. This ensures that an error is not missed if
+      # that happens.
+      print "skimage output changed! This may cause other self tests to fail!"
+      exit(1)
 
     # Ignore failure:
     ignore_expectations = os.path.join(expectations_dir, "ignore-results.json")
-    subprocess.check_call([skimage_binary, "--readPath", invalid_file,
-                           "--readExpectationsPath", ignore_expectations])
+    output = subprocess.check_output([skimage_binary, "--readPath", invalid_file,
+                                      "--readExpectationsPath",
+                                      ignore_expectations],
+                                     stderr=subprocess.STDOUT)
+    if not "failures" in output:
+      # Another test (in main()) tests to ensure that "failures" does not
+      # appear in the output. That test could be passed if the output changed
+      # so "failures" never appears. This ensures that an error is not missed
+      # if that happens.
+      print "skimage output changed! This may cause other self tests to fail!"
+      exit(1)
 
 def test_incorrect_expectations(file_dir, skimage_binary):
     """ Test that comparing to incorrect expectations fails, unless
@@ -125,8 +143,28 @@
 
     # Tell skimage to read back the expectations file it just wrote, and
     # confirm that the images in images_dir match it.
-    subprocess.check_call([skimage_binary, "--readPath", images_dir,
-                           "--readExpectationsPath", expectations_path])
+    output = subprocess.check_output([skimage_binary, "--readPath", images_dir,
+                                      "--readExpectationsPath",
+                                      expectations_path],
+                                     stderr=subprocess.STDOUT)
+
+    # Although skimage succeeded, it would have reported success if the file
+    # was missing from the expectations file. Consider this a failure, since
+    # the expectations file was created from this same image. (It will print
+    # "Missing" in this case before listing the missing expectations).
+    if "Missing" in output:
+      print "Expectations file was missing expectations!"
+      print output
+      exit(1)
+
+    # Again, skimage would succeed if there were known failures (and print
+    # "failures"), but there should be no failures, since the file just
+    # created did not include failures to ignore.
+    if "failures" in output:
+      print "Image failed!"
+      print output
+      exit(1)
+
 
     test_incorrect_expectations(file_dir=file_dir,
                                 skimage_binary=skimage_binary)