diff --git a/recorder/redisindexer.py b/recorder/redisindexer.py
index afa8a305..33d83692 100644
--- a/recorder/redisindexer.py
+++ b/recorder/redisindexer.py
@@ -32,7 +32,7 @@ class WritableRedisIndexer(RedisIndexSource):
 
         self.redis.hset(file_key, filename, full_filename)
 
-    def index_records(self, stream, params, filename=None):
+    def add_urls_to_index(self, stream, params, filename=None):
         rel_path = res_template(self.rel_path_template, params)
         filename = os.path.relpath(filename, rel_path)
 
diff --git a/recorder/warcwriter.py b/recorder/warcwriter.py
index aee12072..a5b8ce0d 100644
--- a/recorder/warcwriter.py
+++ b/recorder/warcwriter.py
@@ -233,7 +233,6 @@ class Digester(object):
 
 # ============================================================================
 class MultiFileWARCWriter(BaseWARCWriter):
-
     def __init__(self, dir_template, filename_template=None, max_size=0,
                  *args, **kwargs):
         super(MultiFileWARCWriter, self).__init__(*args, **kwargs)
@@ -254,8 +253,9 @@ class MultiFileWARCWriter(BaseWARCWriter):
     def _open_file(self, dir_, params):
         timestamp = timestamp20_now()
 
-        filename = dir_ + self.filename_template.format(hostname=self.hostname,
-                                                        timestamp=timestamp)
+        filename = dir_ + res_template(self.filename_template, params,
+                                       hostname=self.hostname,
+                                       timestamp=timestamp)
 
         path, name = os.path.split(filename)
 
@@ -311,7 +311,7 @@ class MultiFileWARCWriter(BaseWARCWriter):
             out.seek(start)
 
             if self.dedup_index:
-                self.dedup_index.index_records(out, params, filename=filename)
+                self.dedup_index.add_urls_to_index(out, params, filename=filename)
 
         except Exception as e:
             traceback.print_exc()