diff --git a/dataloader.py b/dataloader.py
index 305880a9545f396303614dbc35c070488beae596..5ccda0778a4bde725bc54e8c0807cb0dfaad68a7 100644
--- a/dataloader.py
+++ b/dataloader.py
@@ -7,7 +7,7 @@ import pandas as pd
 from wela.correct_buds import correct_buds
 
 try:
-    from postprocessor.grouper import NameGrouper
+    from postprocessor.grouper import Grouper
 except ModuleNotFoundError:
     print("Can only load tsv files - cannot find postprocessor")
 
@@ -137,7 +137,7 @@ class dataloader:
 
     def get_grouper(self, dataname):
         """
-        Return an instance of NameGrouper.
+        Return an instance of Grouper.
 
         Arguments
         ---------
@@ -146,11 +146,11 @@ class dataloader:
 
         Returns
         -------
-        grouper: instance of NameGrouper
+        grouper: instance of Grouper
         """
         if dataname[-4:] == ".tsv":
             dataname = dataname[:-4]
-        grouper = NameGrouper(self.h5dirpath / dataname)
+        grouper = Grouper(self.h5dirpath / dataname)
         return grouper
 
     def load(
@@ -230,7 +230,7 @@ class dataloader:
             for signal in grouper.available:
                 print(" ", signal)
             # find time interval between images
-            self.dt = grouper.tintervals
+            self.dt = grouper.tinterval
             # get key index for choosing cells
             key_index_path = self.a2g_dict[key_index]
             key_index = self.get_key_index(grouper, key_index_path, cutoff)
@@ -426,8 +426,7 @@ class dataloader:
     @property
     def revert_df(self):
         """
-        Convert the 'id' column into the standard columns used by aliby
-        and vice versa.
+        Convert the 'id' column into aliby's standard columns and vice versa.
 
         These columns are 'position', 'trap', and 'cell_label', either
         adding three columns to the .df data frame or removing three