am bec954d0: Merge "Clean up dangling module names"

* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
  Clean up dangling module names