small refactor for values names
diff for changed location