Change Refactor rewrite rules