replace cm references with oct instead