Refactor: using existing fn
Fix client/user-acceptance? spelling and scopes
requested by client to be dynamic