Use correct common module path