Merge "Factor out module name validation into a static function"