FIX #2032, FIX #2033: ensure module names consistency with __all__