Fix line indent
Remove matcher, add term name