diff --git a/gnes/score_fn/__init__.py b/gnes/score_fn/__init__.py
index 9bbcffbd..8dcd09bc 100644
--- a/gnes/score_fn/__init__.py
+++ b/gnes/score_fn/__init__.py
@@ -18,8 +18,8 @@
 
 _cls2file_map = {
     'BaseScoreFn': 'base',
-    'ScoreCombinedFn': 'base',
-    'ModifierFn': 'base',
+    'CombinedScoreFn': 'base',
+    'ModifierScoreFn': 'base',
     'WeightedChunkScoreFn': 'chunk',
     'WeightedDocScoreFn': 'doc',
     'Normalizer1': 'normalize',