These branches got messed up. Oh well. Renaming the data interface 'module'.