-${USERNAME} basic_15_test_user
-${USER_PASSWORD} Basic_15_user_pass
-${USER_NEW_PASSWORD} Basic_15_new_pass
-${USER_ROLE} project_user
-${USER_PROJECT} admin
-${PROJECT_NAME} basic_15_test_project
-${NEW_PROJECT_NAME} basic_15_project_test
-${ROLE_NAME} test_role
-${SUCCESS_RETURN_CODE} 0
+${user_name} basic_15_test_user
+${user_password} Basic_15_user_pass
+${user_new_password} Basic_15_new_pass
+${user_role} project_user
+${user_project} admin
+${project_name} basic_15_test_project
+${new_project_name} basic_15_project_test
+${role_name} test_role
+${success_return_code} 0