diff --git a/hived/pyresttest_api_tests/account_history_api/account_history_api_test.yaml b/hived/pyrest_tests/account_history_api/account_history_api_test.yaml
similarity index 100%
rename from hived/pyresttest_api_tests/account_history_api/account_history_api_test.yaml
rename to hived/pyrest_tests/account_history_api/account_history_api_test.yaml
diff --git a/hived/pyresttest_api_tests/account_history_api/get_account_history.json.pat b/hived/pyrest_tests/account_history_api/get_account_history.json.pat
similarity index 100%
rename from hived/pyresttest_api_tests/account_history_api/get_account_history.json.pat
rename to hived/pyrest_tests/account_history_api/get_account_history.json.pat
diff --git a/hived/pyresttest_api_tests/account_history_api/get_ops_in_block.json.pat b/hived/pyrest_tests/account_history_api/get_ops_in_block.json.pat
similarity index 100%
rename from hived/pyresttest_api_tests/account_history_api/get_ops_in_block.json.pat
rename to hived/pyrest_tests/account_history_api/get_ops_in_block.json.pat
diff --git a/hived/pyresttest_api_tests/account_history_api/request_template.json b/hived/pyrest_tests/account_history_api/request_template.json
similarity index 100%
rename from hived/pyresttest_api_tests/account_history_api/request_template.json
rename to hived/pyrest_tests/account_history_api/request_template.json
diff --git a/hived/pyresttest_api_tests/basic_smoketest.yaml b/hived/pyrest_tests/basic_smoketest.yaml
similarity index 100%
rename from hived/pyresttest_api_tests/basic_smoketest.yaml
rename to hived/pyrest_tests/basic_smoketest.yaml
diff --git a/hived/pyresttest_api_tests/comparator_appbase_ops.py b/hived/pyrest_tests/comparator_appbase_ops.py
similarity index 100%
rename from hived/pyresttest_api_tests/comparator_appbase_ops.py
rename to hived/pyrest_tests/comparator_appbase_ops.py
diff --git a/hived/pyresttest_api_tests/comparator_contain.py b/hived/pyrest_tests/comparator_contain.py
similarity index 100%
rename from hived/pyresttest_api_tests/comparator_contain.py
rename to hived/pyrest_tests/comparator_contain.py
diff --git a/hived/pyresttest_api_tests/comparator_equal.py b/hived/pyrest_tests/comparator_equal.py
similarity index 100%
rename from hived/pyresttest_api_tests/comparator_equal.py
rename to hived/pyrest_tests/comparator_equal.py
diff --git a/hived/pyresttest_api_tests/compare_state/compare_block_appbase.json b/hived/pyrest_tests/compare_state/compare_block_appbase.json
similarity index 100%
rename from hived/pyresttest_api_tests/compare_state/compare_block_appbase.json
rename to hived/pyrest_tests/compare_state/compare_block_appbase.json
diff --git a/hived/pyresttest_api_tests/compare_state/compare_block_appbase.yaml b/hived/pyrest_tests/compare_state/compare_block_appbase.yaml
similarity index 100%
rename from hived/pyresttest_api_tests/compare_state/compare_block_appbase.yaml
rename to hived/pyrest_tests/compare_state/compare_block_appbase.yaml
diff --git a/hived/pyresttest_api_tests/compare_state/compare_block_old.json b/hived/pyrest_tests/compare_state/compare_block_old.json
similarity index 100%
rename from hived/pyresttest_api_tests/compare_state/compare_block_old.json
rename to hived/pyrest_tests/compare_state/compare_block_old.json
diff --git a/hived/pyresttest_api_tests/compare_state/compare_block_old.yaml b/hived/pyrest_tests/compare_state/compare_block_old.yaml
similarity index 100%
rename from hived/pyresttest_api_tests/compare_state/compare_block_old.yaml
rename to hived/pyrest_tests/compare_state/compare_block_old.yaml
diff --git a/hived/pyresttest_api_tests/compare_state_history.sh b/hived/pyrest_tests/compare_state_history.sh
similarity index 100%
rename from hived/pyresttest_api_tests/compare_state_history.sh
rename to hived/pyrest_tests/compare_state_history.sh
diff --git a/hived/pyresttest_api_tests/condenser_api/find_proposals.json.pat b/hived/pyrest_tests/condenser_api/find_proposals.json.pat
similarity index 100%
rename from hived/pyresttest_api_tests/condenser_api/find_proposals.json.pat
rename to hived/pyrest_tests/condenser_api/find_proposals.json.pat
diff --git a/hived/pyresttest_api_tests/condenser_api/list_proposals.json.pat b/hived/pyrest_tests/condenser_api/list_proposals.json.pat
similarity index 100%
rename from hived/pyresttest_api_tests/condenser_api/list_proposals.json.pat
rename to hived/pyrest_tests/condenser_api/list_proposals.json.pat
diff --git a/hived/pyresttest_api_tests/condenser_api/list_voter_proposals.json.pat b/hived/pyrest_tests/condenser_api/list_voter_proposals.json.pat
similarity index 100%
rename from hived/pyresttest_api_tests/condenser_api/list_voter_proposals.json.pat
rename to hived/pyrest_tests/condenser_api/list_voter_proposals.json.pat
diff --git a/hived/pyresttest_api_tests/condenser_api/request_template.json b/hived/pyrest_tests/condenser_api/request_template.json
similarity index 100%
rename from hived/pyresttest_api_tests/condenser_api/request_template.json
rename to hived/pyrest_tests/condenser_api/request_template.json
diff --git a/hived/pyresttest_api_tests/condenser_api/sps_via_condenser_test.yaml b/hived/pyrest_tests/condenser_api/sps_via_condenser_test.yaml
similarity index 100%
rename from hived/pyresttest_api_tests/condenser_api/sps_via_condenser_test.yaml
rename to hived/pyrest_tests/condenser_api/sps_via_condenser_test.yaml
diff --git a/hived/pyresttest_api_tests/database_api/database_api_test.yaml b/hived/pyrest_tests/database_api/database_api_test.yaml
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/database_api_test.yaml
rename to hived/pyrest_tests/database_api/database_api_test.yaml
diff --git a/hived/pyresttest_api_tests/database_api/find_account_recovery_requests.schema.json b/hived/pyrest_tests/database_api/find_account_recovery_requests.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/find_account_recovery_requests.schema.json
rename to hived/pyrest_tests/database_api/find_account_recovery_requests.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/find_accounts.schema.json b/hived/pyrest_tests/database_api/find_accounts.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/find_accounts.schema.json
rename to hived/pyrest_tests/database_api/find_accounts.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/find_change_recovery_account_requests.schema.json b/hived/pyrest_tests/database_api/find_change_recovery_account_requests.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/find_change_recovery_account_requests.schema.json
rename to hived/pyrest_tests/database_api/find_change_recovery_account_requests.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/find_escrows.schema.json b/hived/pyrest_tests/database_api/find_escrows.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/find_escrows.schema.json
rename to hived/pyrest_tests/database_api/find_escrows.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/find_owner_histories.schema.json b/hived/pyrest_tests/database_api/find_owner_histories.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/find_owner_histories.schema.json
rename to hived/pyrest_tests/database_api/find_owner_histories.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/find_savings_withdrawals.schema.json b/hived/pyrest_tests/database_api/find_savings_withdrawals.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/find_savings_withdrawals.schema.json
rename to hived/pyrest_tests/database_api/find_savings_withdrawals.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/find_vesting_delegation_expirations.schema.json b/hived/pyrest_tests/database_api/find_vesting_delegation_expirations.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/find_vesting_delegation_expirations.schema.json
rename to hived/pyrest_tests/database_api/find_vesting_delegation_expirations.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/find_vesting_delegations.schema.json b/hived/pyrest_tests/database_api/find_vesting_delegations.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/find_vesting_delegations.schema.json
rename to hived/pyrest_tests/database_api/find_vesting_delegations.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/find_withdraw_vesting_routes.schema.json b/hived/pyrest_tests/database_api/find_withdraw_vesting_routes.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/find_withdraw_vesting_routes.schema.json
rename to hived/pyrest_tests/database_api/find_withdraw_vesting_routes.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/find_witnesses.schema.json b/hived/pyrest_tests/database_api/find_witnesses.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/find_witnesses.schema.json
rename to hived/pyrest_tests/database_api/find_witnesses.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/get_active_witnesses.schema.json b/hived/pyrest_tests/database_api/get_active_witnesses.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/get_active_witnesses.schema.json
rename to hived/pyrest_tests/database_api/get_active_witnesses.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/get_config.schema.json b/hived/pyrest_tests/database_api/get_config.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/get_config.schema.json
rename to hived/pyrest_tests/database_api/get_config.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/get_current_price_feed.schema.json b/hived/pyrest_tests/database_api/get_current_price_feed.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/get_current_price_feed.schema.json
rename to hived/pyrest_tests/database_api/get_current_price_feed.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/get_dynamic_global_properties.schema.json b/hived/pyrest_tests/database_api/get_dynamic_global_properties.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/get_dynamic_global_properties.schema.json
rename to hived/pyrest_tests/database_api/get_dynamic_global_properties.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/get_feed_history.schema.json b/hived/pyrest_tests/database_api/get_feed_history.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/get_feed_history.schema.json
rename to hived/pyrest_tests/database_api/get_feed_history.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/get_hardfork_properties.schema.json b/hived/pyrest_tests/database_api/get_hardfork_properties.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/get_hardfork_properties.schema.json
rename to hived/pyrest_tests/database_api/get_hardfork_properties.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/get_reward_funds.schema.json b/hived/pyrest_tests/database_api/get_reward_funds.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/get_reward_funds.schema.json
rename to hived/pyrest_tests/database_api/get_reward_funds.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/get_version.schema.json b/hived/pyrest_tests/database_api/get_version.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/get_version.schema.json
rename to hived/pyrest_tests/database_api/get_version.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/get_witness_schedule.schema.json b/hived/pyrest_tests/database_api/get_witness_schedule.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/get_witness_schedule.schema.json
rename to hived/pyrest_tests/database_api/get_witness_schedule.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_account_recovery_requests.schema.json b/hived/pyrest_tests/database_api/list_account_recovery_requests.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_account_recovery_requests.schema.json
rename to hived/pyrest_tests/database_api/list_account_recovery_requests.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_accounts.schema.json b/hived/pyrest_tests/database_api/list_accounts.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_accounts.schema.json
rename to hived/pyrest_tests/database_api/list_accounts.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_change_recovery_account_requests.schema.json b/hived/pyrest_tests/database_api/list_change_recovery_account_requests.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_change_recovery_account_requests.schema.json
rename to hived/pyrest_tests/database_api/list_change_recovery_account_requests.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_escrows.schema.json b/hived/pyrest_tests/database_api/list_escrows.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_escrows.schema.json
rename to hived/pyrest_tests/database_api/list_escrows.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_owner_histories.schema.json b/hived/pyrest_tests/database_api/list_owner_histories.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_owner_histories.schema.json
rename to hived/pyrest_tests/database_api/list_owner_histories.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_savings_withdrawals.schema.json b/hived/pyrest_tests/database_api/list_savings_withdrawals.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_savings_withdrawals.schema.json
rename to hived/pyrest_tests/database_api/list_savings_withdrawals.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_vesting_delegation_expirations.schema.json b/hived/pyrest_tests/database_api/list_vesting_delegation_expirations.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_vesting_delegation_expirations.schema.json
rename to hived/pyrest_tests/database_api/list_vesting_delegation_expirations.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_vesting_delegations.schema.json b/hived/pyrest_tests/database_api/list_vesting_delegations.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_vesting_delegations.schema.json
rename to hived/pyrest_tests/database_api/list_vesting_delegations.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_withdraw_vesting_routes.schema.json b/hived/pyrest_tests/database_api/list_withdraw_vesting_routes.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_withdraw_vesting_routes.schema.json
rename to hived/pyrest_tests/database_api/list_withdraw_vesting_routes.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_witness_votes.schema.json b/hived/pyrest_tests/database_api/list_witness_votes.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_witness_votes.schema.json
rename to hived/pyrest_tests/database_api/list_witness_votes.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/list_witnesses.schema.json b/hived/pyrest_tests/database_api/list_witnesses.schema.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/list_witnesses.schema.json
rename to hived/pyrest_tests/database_api/list_witnesses.schema.json
diff --git a/hived/pyresttest_api_tests/database_api/request_template.json b/hived/pyrest_tests/database_api/request_template.json
similarity index 100%
rename from hived/pyresttest_api_tests/database_api/request_template.json
rename to hived/pyrest_tests/database_api/request_template.json
diff --git a/hived/pyresttest_api_tests/jsonsocket.py b/hived/pyrest_tests/jsonsocket.py
similarity index 100%
rename from hived/pyresttest_api_tests/jsonsocket.py
rename to hived/pyrest_tests/jsonsocket.py
diff --git a/hived/pyresttest_api_tests/list_account.py b/hived/pyrest_tests/list_account.py
similarity index 100%
rename from hived/pyresttest_api_tests/list_account.py
rename to hived/pyrest_tests/list_account.py
diff --git a/hived/pyresttest_api_tests/run_api_tests.sh b/hived/pyrest_tests/run_api_tests.sh
similarity index 100%
rename from hived/pyresttest_api_tests/run_api_tests.sh
rename to hived/pyrest_tests/run_api_tests.sh
diff --git a/hived/pyresttest_api_tests/schema_generator.py b/hived/pyrest_tests/schema_generator.py
similarity index 100%
rename from hived/pyresttest_api_tests/schema_generator.py
rename to hived/pyrest_tests/schema_generator.py
diff --git a/hived/pyresttest_api_tests/sps_api/find_proposals.json.pat b/hived/pyrest_tests/sps_api/find_proposals.json.pat
similarity index 100%
rename from hived/pyresttest_api_tests/sps_api/find_proposals.json.pat
rename to hived/pyrest_tests/sps_api/find_proposals.json.pat
diff --git a/hived/pyresttest_api_tests/sps_api/list_proposals.json.pat b/hived/pyrest_tests/sps_api/list_proposals.json.pat
similarity index 100%
rename from hived/pyresttest_api_tests/sps_api/list_proposals.json.pat
rename to hived/pyrest_tests/sps_api/list_proposals.json.pat
diff --git a/hived/pyresttest_api_tests/sps_api/list_voter_proposals.json.pat b/hived/pyrest_tests/sps_api/list_voter_proposals.json.pat
similarity index 100%
rename from hived/pyresttest_api_tests/sps_api/list_voter_proposals.json.pat
rename to hived/pyrest_tests/sps_api/list_voter_proposals.json.pat
diff --git a/hived/pyresttest_api_tests/sps_api/request_template.json b/hived/pyrest_tests/sps_api/request_template.json
similarity index 100%
rename from hived/pyresttest_api_tests/sps_api/request_template.json
rename to hived/pyrest_tests/sps_api/request_template.json
diff --git a/hived/pyresttest_api_tests/sps_api/sps_api_test.yaml b/hived/pyrest_tests/sps_api/sps_api_test.yaml
similarity index 100%
rename from hived/pyresttest_api_tests/sps_api/sps_api_test.yaml
rename to hived/pyrest_tests/sps_api/sps_api_test.yaml
diff --git a/hived/pyresttest_api_tests/test_ah_get_account_history.py b/hived/pyrest_tests/test_ah_get_account_history.py
similarity index 100%
rename from hived/pyresttest_api_tests/test_ah_get_account_history.py
rename to hived/pyrest_tests/test_ah_get_account_history.py
diff --git a/hived/pyresttest_api_tests/test_ah_get_ops_in_block.py b/hived/pyrest_tests/test_ah_get_ops_in_block.py
similarity index 100%
rename from hived/pyresttest_api_tests/test_ah_get_ops_in_block.py
rename to hived/pyrest_tests/test_ah_get_ops_in_block.py
diff --git a/hived/pyresttest_api_tests/validator_ex.py b/hived/pyrest_tests/validator_ex.py
similarity index 100%
rename from hived/pyresttest_api_tests/validator_ex.py
rename to hived/pyrest_tests/validator_ex.py