Revert "Fix bad module naming when using custom output"

This reverts commit d0f4149c2a426ad136bab6559bc2dd1c712492b4.
I don't get any of the rational behind it. I think "someone"
can benefit from code review...