Made naming consistent with Unit service

Nicholas Karskyrequested to merge
jwt_var_change into master

make variable naming the same with unit service as to not add more required variables

Merge request reports