Change to use Module name instead of distribution