CDB-1313 #comment Avoid name clashes when moving to the cdb_importer schema