changing attribute names
these ones were changed by mistake
Merge branch 'dev' into merge/api_and_api-cleanup