Moved part of code to vinzi.name-match