Move away from depending on module id  - https://tickets.openmrs.org/browse/TRUNK-3349