module-rename, updated API to work with new data types