Convert parameterized modules for R16 support.