add shortcut model as class name
migrate template references to MethodMatcher