update module mappings

Change-Id: Ia0893eda90307e5dbb7265b3c321515a8b823a24