Module ids are unique even across module types. Fix bugs where other fields were being used for an id.

--HG--
branch : profiledev