cf12af7519
* Based on previous changes, fix ids so they are consistent with other modules (in preparation for MDL-75255)