#111: module names unified