Fix the import name and rename a mathcer