diff --git a/common.go b/common.go
index 28bed5c..4d0e99a 100644
--- a/common.go
+++ b/common.go
@@ -262,10 +262,10 @@ func detectFormat(path string) (string, error) {
 	switch filepath.Ext(path) {
 	case ".sqlite":
 		return "rikai", nil
-	case ".kanji_freq":
-		return "kanji_freq", nil
-	case ".term_freq":
-		return "term_freq", nil
+	case ".kanjifreq":
+		return "kanjifreq", nil
+	case ".termfreq":
+		return "termfreq", nil
 	}
 
 	switch filepath.Base(path) {
diff --git a/edict.go b/edict.go
index f728d2a..964fcde 100644
--- a/edict.go
+++ b/edict.go
@@ -228,8 +228,8 @@ func jmdictExportDb(inputPath, outputPath, language, title string, stride int, p
 	}
 
 	recordData := map[string]dbRecordList{
-		"terms": terms.crush(),
-		"tags":  jmdictBuildTagMeta(entities).crush(),
+		"term": terms.crush(),
+		"tag":  jmdictBuildTagMeta(entities).crush(),
 	}
 
 	return writeDb(
diff --git a/enamdict.go b/enamdict.go
index 4dee4ff..e003d0f 100644
--- a/enamdict.go
+++ b/enamdict.go
@@ -119,8 +119,8 @@ func jmnedictExportDb(inputPath, outputPath, language, title string, stride int,
 	}
 
 	recordData := map[string]dbRecordList{
-		"terms": terms.crush(),
-		"tags":  jmnedictBuildTagMeta(entities).crush(),
+		"term": terms.crush(),
+		"tag":  jmnedictBuildTagMeta(entities).crush(),
 	}
 
 	return writeDb(
diff --git a/epwing.go b/epwing.go
index ebb596c..d0ec6f3 100644
--- a/epwing.go
+++ b/epwing.go
@@ -202,7 +202,7 @@ func epwingExportDb(inputPath, outputPath, language, title string, stride int, p
 
 	recordData := map[string]dbRecordList{
 		"kanji": kanji.crush(),
-		"terms": terms.crush(),
+		"term":  terms.crush(),
 	}
 
 	return writeDb(
diff --git a/frequency.go b/frequency.go
index fcb0c30..6fd40e9 100644
--- a/frequency.go
+++ b/frequency.go
@@ -31,7 +31,15 @@ import (
 
 const frequencyRevision = "frequency1"
 
-func frequncyExportDb(inputPath, outputPath, language, title string, stride int, pretty bool) error {
+func frequencyTermsExportDb(inputPath, outputPath, language, title string, stride int, pretty bool) error {
+	return frequncyExportDb(inputPath, outputPath, language, title, stride, pretty, "termfreq")
+}
+
+func frequencyKanjiExportDb(inputPath, outputPath, language, title string, stride int, pretty bool) error {
+	return frequncyExportDb(inputPath, outputPath, language, title, stride, pretty, "kanjifreq")
+}
+
+func frequncyExportDb(inputPath, outputPath, language, title string, stride int, pretty bool, key string) error {
 	reader, err := os.Open(inputPath)
 	if err != nil {
 		return err
@@ -60,7 +68,7 @@ func frequncyExportDb(inputPath, outputPath, language, title string, stride int,
 	}
 
 	recordData := map[string]dbRecordList{
-		"frequencies": frequencies.crush(),
+		key: frequencies.crush(),
 	}
 
 	return writeDb(
diff --git a/kanjidic.go b/kanjidic.go
index 1c42a9a..d7ee27c 100644
--- a/kanjidic.go
+++ b/kanjidic.go
@@ -131,7 +131,7 @@ func kanjidicExportDb(inputPath, outputPath, language, title string, stride int,
 
 	recordData := map[string]dbRecordList{
 		"kanji": kanji.crush(),
-		"tags":  tags.crush(),
+		"tag":   tags.crush(),
 	}
 
 	return writeDb(
diff --git a/main.go b/main.go
index e923531..b39d4c3 100644
--- a/main.go
+++ b/main.go
@@ -47,11 +47,13 @@ func usage() {
 
 func exportDb(inputPath, outputPath, format, language, title string, stride int, pretty bool) error {
 	handlers := map[string]func(string, string, string, string, int, bool) error{
-		"edict":    jmdictExportDb,
-		"enamdict": jmnedictExportDb,
-		"epwing":   epwingExportDb,
-		"kanjidic": kanjidicExportDb,
-		"rikai":    rikaiExportDb,
+		"edict":     jmdictExportDb,
+		"enamdict":  jmnedictExportDb,
+		"epwing":    epwingExportDb,
+		"kanjidic":  kanjidicExportDb,
+		"rikai":     rikaiExportDb,
+		"kanjifreq": frequencyKanjiExportDb,
+		"termfreq":  frequencyTermsExportDb,
 	}
 
 	handler, ok := handlers[strings.ToLower(format)]
diff --git a/rikai.go b/rikai.go
index b06bbf7..1459268 100644
--- a/rikai.go
+++ b/rikai.go
@@ -167,8 +167,8 @@ func rikaiExportDb(inputPath, outputPath, language, title string, stride int, pr
 	}
 
 	recordData := map[string]dbRecordList{
-		"terms": terms.crush(),
-		"tags":  tags.crush(),
+		"term": terms.crush(),
+		"tag":  tags.crush(),
 	}
 
 	return writeDb(