Use ds-specific module id to avoid conflicts

Use ds-specific module id to avoid conflicts #1155