diff --git a/src/formats.ts b/src/formats.ts
index efcc7e8..064f728 100644
--- a/src/formats.ts
+++ b/src/formats.ts
@@ -68,7 +68,8 @@ export const getDefaults = (formats: CustomFormats) => {
   Object.keys(formats).forEach(key => {
     const format: CustomFormat = formats[key]
     if (typeof format.defaultValue !== 'undefined') {
-      result[key] = format.defaultValue
+      // store values under name, not under original key
+      result[format.name] = format.defaultValue
     }
   })
   return result
diff --git a/test/formats-test.ts b/test/formats-test.ts
new file mode 100644
index 0000000..4557a92
--- /dev/null
+++ b/test/formats-test.ts
@@ -0,0 +1,17 @@
+import { getDefaults, CustomFormats, CustomFormat } from '../src/formats'
+import test from 'ava'
+
+test('defaults by name', t => {
+  const bar: CustomFormat = {
+    name: 'bar',
+    detect: /bar/,
+    description: 'custom format named "bar"',
+    defaultValue: 'my-value',
+  }
+  const formats: CustomFormats = {
+    foo: bar,
+  }
+  const defaults = getDefaults(formats)
+  t.is(defaults.foo, undefined, 'no default under key foo')
+  t.is(defaults.bar, bar.defaultValue, 'but there is one under name bar')
+})