Merge "Ensure unique name for non-merged modules."