MAINT: function and module renaming passes the tests