Revise "import" entry format
Reuse matcher for rename