Revert "disambiguate module names"

This reverts commit 76d409c5ec3bd11825a85bbbc71a02c2de3af705.