Complete name refactoring
Add an option for tag matching strategy