Follow code cleanup wrt idmap module names.