diff --git a/my/coding/github.py b/my/coding/github.py
index 667f794..cb226f7 100644
--- a/my/coding/github.py
+++ b/my/coding/github.py
@@ -233,7 +233,7 @@ def iter_events() -> Iterator[Res[Event]]:
         yield e
         emitted.add(key)
 
-# TODO load events from GDPR export?
+
 def get_events():
     return sorted(iter_events(), key=lambda e: e.dt)
 
diff --git a/my/fbmessenger.py b/my/fbmessenger.py
index 23ae09e..74097d4 100644
--- a/my/fbmessenger.py
+++ b/my/fbmessenger.py
@@ -3,11 +3,11 @@ from shutil import rmtree
 from tempfile import TemporaryDirectory
 from typing import Iterator, Union
 
-import mycfg.repos.fbmessengerexport.model as messenger
+import mycfg.repos.fbmessengerexport.dal as messenger
 from mycfg import paths
 
 
-def _dump_helper(model: messenger.Model, tdir: Path) -> None:
+def _dump_helper(model: messenger.DAL, tdir: Path) -> None:
     for t in model.iter_threads():
         name = t.name.replace('/', '_') # meh..
         path = tdir / (name + '.txt')
@@ -19,11 +19,11 @@ def _dump_helper(model: messenger.Model, tdir: Path) -> None:
                 print(msg, file=fo)
 
 
-def get_model() -> messenger.Model:
-    return messenger.Model(paths.fbmessenger.export_db)
+def get_model() -> messenger.DAL:
+    return messenger.DAL(paths.fbmessenger.export_db)
 
 
-# TODO FIXME result type?
+# TODO FIXME Result type?
 def iter_all_messages() -> Iterator[messenger.Message]:
     model = get_model()
     for t in model.iter_threads():
diff --git a/my/reading/goodreads.py b/my/reading/goodreads.py
index 77b50e0..47a67f7 100755
--- a/my/reading/goodreads.py
+++ b/my/reading/goodreads.py
@@ -4,13 +4,13 @@ from typing import NamedTuple
 from datetime import datetime
 import pytz
 
-from mycfg.repos.goodrexport import model as goodrexport
+from mycfg.repos.goodrexport import dal as goodrexport
 from mycfg import paths
 
 
 def get_model():
     sources = list(sorted(paths.goodrexport.export_dir.glob('*.xml')))
-    model = goodrexport.Model(sources)
+    model = goodrexport.DAL(sources)
     return model
 
 
diff --git a/my/reddit.py b/my/reddit.py
index 1daeda6..a94acf7 100755
--- a/my/reddit.py
+++ b/my/reddit.py
@@ -5,7 +5,7 @@ from typing import List, Sequence, Mapping
 from .common import mcachew
 
 from mycfg import paths
-import mycfg.repos.rexport.model as rexport
+import mycfg.repos.rexport.dal as rexport
 
 
 # TODO Move this to kython.kompress?
@@ -29,7 +29,7 @@ def get_backup_files() -> Sequence[Path]:
 
 
 def get_model():
-    model = rexport.Model(get_backup_files())
+    model = rexport.DAL(get_backup_files())
     return model
 
 
@@ -99,7 +99,7 @@ def _get_state(bfile: Path) -> Dict[Sid, SaveWithDt]:
 
     bdt = _get_bdate(bfile)
 
-    saves = [SaveWithDt(save, bdt) for save in rexport.Model([bfile]).saved()]
+    saves = [SaveWithDt(save, bdt) for save in rexport.DAL([bfile]).saved()]
     # TODO FIXME remove kython?
     from kython import make_dict
     return make_dict(