rework how we check if name param exists
Merge branch 'dev' into test