diff --git a/.gitmodules b/.gitmodules
index c08da2e2..9e00a2cb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,7 @@
 	url = https://gitlab.com/PBSA/tools-libs/peerplays-fc.git
 	branch = latest-fc
 	ignore = dirty
-[submodule "libraries/vendor/SHA3IUF/SHA3IUF"]
-	path = libraries/vendor/SHA3IUF/SHA3IUF
+[submodule "libraries/vendor/SHA3IUF"]
+	path = libraries/vendor/SHA3IUF
 	url = https://github.com/brainhub/SHA3IUF.git
+	branch = master
diff --git a/libraries/plugins/peerplays_sidechain/CMakeLists.txt b/libraries/plugins/peerplays_sidechain/CMakeLists.txt
index 44c0a8e3..6546b031 100755
--- a/libraries/plugins/peerplays_sidechain/CMakeLists.txt
+++ b/libraries/plugins/peerplays_sidechain/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library( peerplays_sidechain
              sidechain_net_manager.cpp
              sidechain_net_handler.cpp
              sidechain_net_handler_bitcoin.cpp
-	     sidechain_net_handler_eth.cpp
+             sidechain_net_handler_ethereum.cpp
              sidechain_net_handler_hive.cpp
              sidechain_net_handler_peerplays.cpp
              bitcoin/bech32.cpp
@@ -18,12 +18,12 @@ add_library( peerplays_sidechain
              bitcoin/sign_bitcoin_transaction.cpp
              common/rpc_client.cpp
              common/utils.cpp
+             ethereum/transaction.cpp
+             ethereum/types.cpp
              hive/asset.cpp
              hive/operations.cpp
              hive/transaction.cpp
              hive/types.cpp
-	     ethereum/transaction.cpp
-	     ethereum/types.cpp
            )
 
 if (ENABLE_DEV_FEATURES)
diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_eth.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp
similarity index 100%
rename from libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_eth.hpp
rename to libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp
diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_eth.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
similarity index 99%
rename from libraries/plugins/peerplays_sidechain/sidechain_net_handler_eth.cpp
rename to libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
index 5afa4eda..cf830a7c 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_eth.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
@@ -1,4 +1,4 @@
-#include <graphene/peerplays_sidechain/sidechain_net_handler_eth.hpp>
+#include <graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp>
 
 #include <algorithm>
 #include <thread>
diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_manager.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_manager.cpp
index a5c52920..adb9196d 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_manager.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_manager.cpp
@@ -3,7 +3,7 @@
 #include <fc/log/logger.hpp>
 #include <graphene/chain/son_wallet_object.hpp>
 #include <graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp>
-#include <graphene/peerplays_sidechain/sidechain_net_handler_eth.hpp>
+#include <graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp>
 #include <graphene/peerplays_sidechain/sidechain_net_handler_hive.hpp>
 #include <graphene/peerplays_sidechain/sidechain_net_handler_peerplays.hpp>
 
@@ -33,7 +33,7 @@ bool sidechain_net_manager::create_handler(sidechain_type sidechain, const boost
       break;
    }
    case sidechain_type::ethereum: {
-      std::unique_ptr<sidechain_net_handler> h = std::unique_ptr<sidechain_net_handler>(new sidechain_net_handler_eth(plugin, options));
+      std::unique_ptr<sidechain_net_handler> h = std::unique_ptr<sidechain_net_handler>(new sidechain_net_handler_ethereum(plugin, options));
       net_handlers.push_back(std::move(h));
       ret_val = true;
       break;
diff --git a/libraries/vendor/CMakeLists.txt b/libraries/vendor/CMakeLists.txt
index c423bd66..6047e95e 100755
--- a/libraries/vendor/CMakeLists.txt
+++ b/libraries/vendor/CMakeLists.txt
@@ -1 +1,26 @@
-add_subdirectory( SHA3IUF )
\ No newline at end of file
+PROJECT( SHA3IUF )
+
+include(ExternalProject)
+
+ExternalProject_Add(project_SHA3IUF
+  PREFIX ${CMAKE_CURRENT_BINARY_DIR}
+  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF
+  CONFIGURE_COMMAND cp -R ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF/. ${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build
+  BUILD_COMMAND make
+  INSTALL_COMMAND true
+  BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX}
+  LOG_BUILD ON
+)
+
+ExternalProject_Get_Property(project_SHA3IUF binary_dir)
+add_library(SHA3IUF STATIC IMPORTED)
+message(STATUS "Setting up SHA3IUF to ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set_property(TARGET SHA3IUF PROPERTY IMPORTED_LOCATION ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX})
+set_property(TARGET SHA3IUF PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF)
+
+add_dependencies(SHA3IUF project_SHA3IUF)
+install( FILES ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION lib )
+
+set(SHA3IUF_libraries sha3 CACHE INTERNAL "")
+set(SHA3IUF_include_dirs "${CMAKE_CURRENT_LIST_DIR}/SHA3IUF" CACHE INTERNAL "")
+set(SHA3IUF_link_dirs "${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build" CACHE INTERNAL "")
diff --git a/libraries/vendor/SHA3IUF/SHA3IUF b/libraries/vendor/SHA3IUF
similarity index 100%
rename from libraries/vendor/SHA3IUF/SHA3IUF
rename to libraries/vendor/SHA3IUF
diff --git a/libraries/vendor/SHA3IUF/CMakeLists.txt b/libraries/vendor/SHA3IUF/CMakeLists.txt
deleted file mode 100755
index 0666d7ed..00000000
--- a/libraries/vendor/SHA3IUF/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-PROJECT( SHA3IUF )
-
-include(ExternalProject)
-
-ExternalProject_Add(project_SHA3IUF
-  PREFIX ${CMAKE_CURRENT_BINARY_DIR}
-  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF
-  CONFIGURE_COMMAND cp -R ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF/. ${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build
-  BUILD_COMMAND make
-  INSTALL_COMMAND true
-  BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX}
-  LOG_BUILD ON
-)
-
-ExternalProject_Get_Property(project_SHA3IUF binary_dir)
-add_library(SHA3IUF STATIC IMPORTED)
-message(STATUS "Setting up SHA3IUF to ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX}")
-set_property(TARGET SHA3IUF PROPERTY IMPORTED_LOCATION ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX})
-set_property(TARGET SHA3IUF PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF)
-
-add_dependencies(SHA3IUF project_SHA3IUF)
-install( FILES ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION lib )
-
-set(SHA3IUF_libraries sha3 CACHE INTERNAL "")
-set(SHA3IUF_include_dirs "${CMAKE_CURRENT_LIST_DIR}/SHA3IUF" CACHE INTERNAL "")
-set(SHA3IUF_link_dirs "${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build" CACHE INTERNAL "")
\ No newline at end of file