Maint: Simplify module names