diff --git a/contracts/CMakeLists.txt b/contracts/CMakeLists.txt
index 1843ce77189..7f2cd19327d 100644
--- a/contracts/CMakeLists.txt
+++ b/contracts/CMakeLists.txt
@@ -4,7 +4,7 @@ set(DEFAULT_SYSTEM_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts/libc++/upstream
 
 set(STANDARD_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts ${CMAKE_SOURCE_DIR}/externals/magic_get/include)
 
-add_subdirectory(eosiolib)
+add_subdirectory(enumivolib)
 add_subdirectory(musl)
 add_subdirectory(libc++)
 add_subdirectory(simple.token)
@@ -46,7 +46,7 @@ add_custom_command(OUTPUT share/eosio/skeleton/skeleton.cpp
                    VERBATIM)
 add_custom_target(copy_skeleton_contract ALL DEPENDS share/eosio/skeleton/skeleton.cpp)
 
-install(DIRECTORY eosiolib DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+install(DIRECTORY enumivolib DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 install(DIRECTORY eosio.system DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 install(DIRECTORY musl DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 install(DIRECTORY libc++ DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
diff --git a/contracts/asserter/CMakeLists.txt b/contracts/asserter/CMakeLists.txt
index e73595af1de..2156715e5c6 100644
--- a/contracts/asserter/CMakeLists.txt
+++ b/contracts/asserter/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET asserter
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc libc++ eosiolib
+  LIBRARIES libc libc++ enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/asserter/asserter.hpp b/contracts/asserter/asserter.hpp
index 99680870c04..7977a2eb8c9 100644
--- a/contracts/asserter/asserter.hpp
+++ b/contracts/asserter/asserter.hpp
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 
 namespace asserter {
    struct assertdef {
diff --git a/contracts/bancor/CMakeLists.txt b/contracts/bancor/CMakeLists.txt
index b845361e8f0..2de215a74d7 100644
--- a/contracts/bancor/CMakeLists.txt
+++ b/contracts/bancor/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET bancor
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc libc++ eosiolib
+  LIBRARIES libc libc++ enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/bancor/bancor.hpp b/contracts/bancor/bancor.hpp
index 3e888c5cf92..ca0bb893046 100644
--- a/contracts/bancor/bancor.hpp
+++ b/contracts/bancor/bancor.hpp
@@ -4,10 +4,10 @@
  */
 #pragma once
 
-#include <eosiolib/eos.hpp>
-#include <eosiolib/token.hpp>
-#include <eosiolib/reflect.hpp>
-#include <eosiolib/generic_currency.hpp>
+#include <enumivolib/eos.hpp>
+#include <enumivolib/token.hpp>
+#include <enumivolib/reflect.hpp>
+#include <enumivolib/generic_currency.hpp>
 
 #include <bancor/converter.hpp>
 #include <currency/currency.hpp>
diff --git a/contracts/dice/CMakeLists.txt b/contracts/dice/CMakeLists.txt
index 3caf729a2d5..6135ea4a4af 100644
--- a/contracts/dice/CMakeLists.txt
+++ b/contracts/dice/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET dice
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/dice/dice.cpp b/contracts/dice/dice.cpp
index 10864e2432d..02503504b87 100644
--- a/contracts/dice/dice.cpp
+++ b/contracts/dice/dice.cpp
@@ -5,10 +5,10 @@
 #include <utility>
 #include <vector>
 #include <string>
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/asset.hpp>
-#include <eosiolib/contract.hpp>
-#include <eosiolib/crypto.h>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/asset.hpp>
+#include <enumivolib/contract.hpp>
+#include <enumivolib/crypto.h>
 
 using eosio::key256;
 using eosio::indexed_by;
diff --git a/contracts/eosiolib/CMakeLists.txt b/contracts/enumivolib/CMakeLists.txt
similarity index 80%
rename from contracts/eosiolib/CMakeLists.txt
rename to contracts/enumivolib/CMakeLists.txt
index 7c8376031eb..7edafb38822 100644
--- a/contracts/eosiolib/CMakeLists.txt
+++ b/contracts/enumivolib/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_wast_library(TARGET eosiolib
+add_wast_library(TARGET enumivolib
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}" ${CMAKE_SOURCE_DIR}/externals/magic_get/include
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/eosiolib/action.h b/contracts/enumivolib/action.h
similarity index 99%
rename from contracts/eosiolib/action.h
rename to contracts/enumivolib/action.h
index 7356c65daba..f7e64565386 100644
--- a/contracts/eosiolib/action.h
+++ b/contracts/enumivolib/action.h
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #pragma once
-#include <eosiolib/system.h>
+#include <enumivolib/system.h>
 
 extern "C" {
    /**
diff --git a/contracts/eosiolib/action.hpp b/contracts/enumivolib/action.hpp
similarity index 98%
rename from contracts/eosiolib/action.hpp
rename to contracts/enumivolib/action.hpp
index b30c26b170d..04846f685f1 100644
--- a/contracts/eosiolib/action.hpp
+++ b/contracts/enumivolib/action.hpp
@@ -3,9 +3,9 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #pragma once
-#include <eosiolib/action.h>
-#include <eosiolib/datastream.hpp>
-#include <eosiolib/serialize.hpp>
+#include <enumivolib/action.h>
+#include <enumivolib/datastream.hpp>
+#include <enumivolib/serialize.hpp>
 
 #include <boost/preprocessor/variadic/size.hpp>
 #include <boost/preprocessor/variadic/to_tuple.hpp>
diff --git a/contracts/eosiolib/asset.hpp b/contracts/enumivolib/asset.hpp
similarity index 98%
rename from contracts/eosiolib/asset.hpp
rename to contracts/enumivolib/asset.hpp
index aeed55bee21..752e84ffd21 100644
--- a/contracts/eosiolib/asset.hpp
+++ b/contracts/enumivolib/asset.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include <eosiolib/serialize.hpp>
-#include <eosiolib/print.hpp>
-#include <eosiolib/system.h>
+#include <enumivolib/serialize.hpp>
+#include <enumivolib/print.hpp>
+#include <enumivolib/system.h>
 #include <tuple>
 #include <limits>
 
diff --git a/contracts/eosiolib/chain.h b/contracts/enumivolib/chain.h
similarity index 96%
rename from contracts/eosiolib/chain.h
rename to contracts/enumivolib/chain.h
index 3da7cb47f1d..86efaa8fc81 100644
--- a/contracts/eosiolib/chain.h
+++ b/contracts/enumivolib/chain.h
@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#include <eosiolib/types.h>
+#include <enumivolib/types.h>
 
 /**
  *  @defgroup chainapi Chain API
diff --git a/contracts/eosiolib/compiler_builtins.h b/contracts/enumivolib/compiler_builtins.h
similarity index 99%
rename from contracts/eosiolib/compiler_builtins.h
rename to contracts/enumivolib/compiler_builtins.h
index cd69d1dee8e..8d8e9d020a4 100644
--- a/contracts/eosiolib/compiler_builtins.h
+++ b/contracts/enumivolib/compiler_builtins.h
@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#include <eosiolib/system.h>
+#include <enumivolib/system.h>
 
 extern "C" {
   /**
diff --git a/contracts/eosiolib/contract.hpp b/contracts/enumivolib/contract.hpp
similarity index 100%
rename from contracts/eosiolib/contract.hpp
rename to contracts/enumivolib/contract.hpp
diff --git a/contracts/eosiolib/contracts.dox b/contracts/enumivolib/contracts.dox
similarity index 100%
rename from contracts/eosiolib/contracts.dox
rename to contracts/enumivolib/contracts.dox
diff --git a/contracts/eosiolib/crypto.h b/contracts/enumivolib/crypto.h
similarity index 98%
rename from contracts/eosiolib/crypto.h
rename to contracts/enumivolib/crypto.h
index cae78328e15..66e531d6404 100644
--- a/contracts/eosiolib/crypto.h
+++ b/contracts/enumivolib/crypto.h
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #pragma once
-#include <eosiolib/types.h>
+#include <enumivolib/types.h>
 extern "C" {
 /**
  *  This method is implemented as:
diff --git a/contracts/eosiolib/currency.hpp b/contracts/enumivolib/currency.hpp
similarity index 98%
rename from contracts/eosiolib/currency.hpp
rename to contracts/enumivolib/currency.hpp
index 2a5dced3ae7..9e8c72b4488 100644
--- a/contracts/eosiolib/currency.hpp
+++ b/contracts/enumivolib/currency.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/asset.hpp>
-#include <eosiolib/multi_index.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/asset.hpp>
+#include <enumivolib/multi_index.hpp>
 
 namespace eosio {
    using std::string;
diff --git a/contracts/eosiolib/datastream.hpp b/contracts/enumivolib/datastream.hpp
similarity index 99%
rename from contracts/eosiolib/datastream.hpp
rename to contracts/enumivolib/datastream.hpp
index cd38c01fa19..5c7152ec67c 100644
--- a/contracts/eosiolib/datastream.hpp
+++ b/contracts/enumivolib/datastream.hpp
@@ -3,12 +3,12 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #pragma once
-#include <eosiolib/system.h>
-#include <eosiolib/memory.h>
-#include <eosiolib/vector.hpp>
+#include <enumivolib/system.h>
+#include <enumivolib/memory.h>
+#include <enumivolib/vector.hpp>
 #include <boost/container/flat_set.hpp>
 #include <boost/container/flat_map.hpp>
-#include <eosiolib/varint.hpp>
+#include <enumivolib/varint.hpp>
 #include <array>
 #include <set>
 #include <map>
diff --git a/contracts/eosiolib/db.h b/contracts/enumivolib/db.h
similarity index 99%
rename from contracts/eosiolib/db.h
rename to contracts/enumivolib/db.h
index 4074a87e429..d8ca607ff0d 100644
--- a/contracts/eosiolib/db.h
+++ b/contracts/enumivolib/db.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <eosiolib/types.h>
+#include <enumivolib/types.h>
 extern "C" {
 /**
  *  @defgroup database Database API
diff --git a/contracts/eosiolib/dispatcher.hpp b/contracts/enumivolib/dispatcher.hpp
similarity index 98%
rename from contracts/eosiolib/dispatcher.hpp
rename to contracts/enumivolib/dispatcher.hpp
index d1ed3fbfb4a..44ba03ee103 100644
--- a/contracts/eosiolib/dispatcher.hpp
+++ b/contracts/enumivolib/dispatcher.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include <eosiolib/print.hpp>
-#include <eosiolib/action.hpp>
+#include <enumivolib/print.hpp>
+#include <enumivolib/action.hpp>
 
 #include <boost/fusion/adapted/std_tuple.hpp>
 #include <boost/fusion/include/std_tuple.hpp>
diff --git a/contracts/eosiolib/eosiolib.cpp b/contracts/enumivolib/enumivolib.cpp
similarity index 100%
rename from contracts/eosiolib/eosiolib.cpp
rename to contracts/enumivolib/enumivolib.cpp
diff --git a/contracts/enumivolib/eosio.hpp b/contracts/enumivolib/eosio.hpp
new file mode 100644
index 00000000000..b2686794c56
--- /dev/null
+++ b/contracts/enumivolib/eosio.hpp
@@ -0,0 +1,11 @@
+/**
+ *  @file
+ *  @copyright defined in eos/LICENSE.txt
+ */
+#pragma once
+#include <enumivolib/types.hpp>
+#include <enumivolib/action.hpp>
+#include <enumivolib/print.hpp>
+#include <enumivolib/multi_index.hpp>
+#include <enumivolib/dispatcher.hpp>
+#include <enumivolib/contract.hpp>
diff --git a/contracts/eosiolib/fixed_key.hpp b/contracts/enumivolib/fixed_key.hpp
similarity index 99%
rename from contracts/eosiolib/fixed_key.hpp
rename to contracts/enumivolib/fixed_key.hpp
index a011f2f743f..04e6cdf115c 100644
--- a/contracts/eosiolib/fixed_key.hpp
+++ b/contracts/enumivolib/fixed_key.hpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <type_traits>
 
-#include <eosiolib/system.h>
+#include <enumivolib/system.h>
 
 namespace eosio {
 
diff --git a/contracts/eosiolib/fixedpoint.hpp b/contracts/enumivolib/fixedpoint.hpp
similarity index 99%
rename from contracts/eosiolib/fixedpoint.hpp
rename to contracts/enumivolib/fixedpoint.hpp
index fdea9594213..61789a4b5fd 100644
--- a/contracts/eosiolib/fixedpoint.hpp
+++ b/contracts/enumivolib/fixedpoint.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include <eosiolib/types.h>
-#include <eosiolib/print.hpp>
+#include <enumivolib/types.h>
+#include <enumivolib/print.hpp>
 
 namespace eosio
 {
diff --git a/contracts/eosiolib/mainpage.md b/contracts/enumivolib/mainpage.md
similarity index 100%
rename from contracts/eosiolib/mainpage.md
rename to contracts/enumivolib/mainpage.md
diff --git a/contracts/eosiolib/memory.h b/contracts/enumivolib/memory.h
similarity index 75%
rename from contracts/eosiolib/memory.h
rename to contracts/enumivolib/memory.h
index 58e5a482b3d..230346e05d6 100644
--- a/contracts/eosiolib/memory.h
+++ b/contracts/enumivolib/memory.h
@@ -5,4 +5,4 @@
 #pragma once
 
 #include <string.h>
-#include <eosiolib/types.h>
+#include <enumivolib/types.h>
diff --git a/contracts/eosiolib/memory.hpp b/contracts/enumivolib/memory.hpp
similarity index 80%
rename from contracts/eosiolib/memory.hpp
rename to contracts/enumivolib/memory.hpp
index c433761d06d..c53e508df4e 100644
--- a/contracts/eosiolib/memory.hpp
+++ b/contracts/enumivolib/memory.hpp
@@ -4,8 +4,8 @@
  */
 #pragma once
 
-#include <eosiolib/memory.h>
-#include <eosiolib/print.hpp>
+#include <enumivolib/memory.h>
+#include <enumivolib/print.hpp>
 
 void* sbrk(size_t num_bytes);
 
diff --git a/contracts/eosiolib/multi_index.hpp b/contracts/enumivolib/multi_index.hpp
similarity index 99%
rename from contracts/eosiolib/multi_index.hpp
rename to contracts/enumivolib/multi_index.hpp
index 4c1bd1f1b18..9d25586935c 100644
--- a/contracts/eosiolib/multi_index.hpp
+++ b/contracts/enumivolib/multi_index.hpp
@@ -17,12 +17,12 @@
 
 #include <boost/multi_index/mem_fun.hpp>
 
-#include <eosiolib/action.h>
-#include <eosiolib/types.hpp>
-#include <eosiolib/serialize.hpp>
-#include <eosiolib/datastream.hpp>
-#include <eosiolib/db.h>
-#include <eosiolib/fixed_key.hpp>
+#include <enumivolib/action.h>
+#include <enumivolib/types.hpp>
+#include <enumivolib/serialize.hpp>
+#include <enumivolib/datastream.hpp>
+#include <enumivolib/db.h>
+#include <enumivolib/fixed_key.hpp>
 
 namespace eosio {
 
diff --git a/contracts/eosiolib/optional.hpp b/contracts/enumivolib/optional.hpp
similarity index 100%
rename from contracts/eosiolib/optional.hpp
rename to contracts/enumivolib/optional.hpp
diff --git a/contracts/eosiolib/permission.h b/contracts/enumivolib/permission.h
similarity index 99%
rename from contracts/eosiolib/permission.h
rename to contracts/enumivolib/permission.h
index 8acd07fd553..e266f322b05 100644
--- a/contracts/eosiolib/permission.h
+++ b/contracts/enumivolib/permission.h
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #pragma once
-#include <eosiolib/types.h>
+#include <enumivolib/types.h>
 
 extern "C" {
    /**
diff --git a/contracts/eosiolib/permission.hpp b/contracts/enumivolib/permission.hpp
similarity index 98%
rename from contracts/eosiolib/permission.hpp
rename to contracts/enumivolib/permission.hpp
index a6956f5dd28..7a36797f30b 100644
--- a/contracts/eosiolib/permission.hpp
+++ b/contracts/enumivolib/permission.hpp
@@ -4,8 +4,8 @@
  */
 #pragma once
 
-#include <eosiolib/permission.h>
-#include <eosiolib/transaction.hpp>
+#include <enumivolib/permission.h>
+#include <enumivolib/transaction.hpp>
 
 #include <set>
 #include <limits>
diff --git a/contracts/eosiolib/print.h b/contracts/enumivolib/print.h
similarity index 99%
rename from contracts/eosiolib/print.h
rename to contracts/enumivolib/print.h
index de5b4810163..5ea24e5acda 100644
--- a/contracts/eosiolib/print.h
+++ b/contracts/enumivolib/print.h
@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#include <eosiolib/types.h>
+#include <enumivolib/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/contracts/eosiolib/print.hpp b/contracts/enumivolib/print.hpp
similarity index 98%
rename from contracts/eosiolib/print.hpp
rename to contracts/enumivolib/print.hpp
index b8e3109c645..59ac30cfbd6 100644
--- a/contracts/eosiolib/print.hpp
+++ b/contracts/enumivolib/print.hpp
@@ -3,9 +3,9 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #pragma once
-#include <eosiolib/print.h>
-#include <eosiolib/types.hpp>
-#include <eosiolib/fixed_key.hpp>
+#include <enumivolib/print.h>
+#include <enumivolib/types.hpp>
+#include <enumivolib/fixed_key.hpp>
 #include <utility>
 #include <string>
 
diff --git a/contracts/eosiolib/privileged.h b/contracts/enumivolib/privileged.h
similarity index 100%
rename from contracts/eosiolib/privileged.h
rename to contracts/enumivolib/privileged.h
diff --git a/contracts/eosiolib/privileged.hpp b/contracts/enumivolib/privileged.hpp
similarity index 100%
rename from contracts/eosiolib/privileged.hpp
rename to contracts/enumivolib/privileged.hpp
diff --git a/contracts/eosiolib/producer_schedule.hpp b/contracts/enumivolib/producer_schedule.hpp
similarity index 90%
rename from contracts/eosiolib/producer_schedule.hpp
rename to contracts/enumivolib/producer_schedule.hpp
index d1b9dd7f5da..e46567aeae5 100644
--- a/contracts/eosiolib/producer_schedule.hpp
+++ b/contracts/enumivolib/producer_schedule.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <eosiolib/privileged.hpp>
+#include <enumivolib/privileged.hpp>
 
 #include <vector>
 
diff --git a/contracts/eosiolib/public_key.hpp b/contracts/enumivolib/public_key.hpp
similarity index 87%
rename from contracts/eosiolib/public_key.hpp
rename to contracts/enumivolib/public_key.hpp
index 414d535bedd..55960fb21c2 100644
--- a/contracts/eosiolib/public_key.hpp
+++ b/contracts/enumivolib/public_key.hpp
@@ -1,6 +1,6 @@
 #pragma once 
-#include <eosiolib/varint.hpp>
-#include <eosiolib/serialize.hpp>
+#include <enumivolib/varint.hpp>
+#include <enumivolib/serialize.hpp>
 
 namespace eosio {
    struct public_key {
diff --git a/contracts/eosiolib/reflect.hpp b/contracts/enumivolib/reflect.hpp
similarity index 100%
rename from contracts/eosiolib/reflect.hpp
rename to contracts/enumivolib/reflect.hpp
diff --git a/contracts/eosiolib/rpc.dox b/contracts/enumivolib/rpc.dox
similarity index 100%
rename from contracts/eosiolib/rpc.dox
rename to contracts/enumivolib/rpc.dox
diff --git a/contracts/eosiolib/serialize.hpp b/contracts/enumivolib/serialize.hpp
similarity index 100%
rename from contracts/eosiolib/serialize.hpp
rename to contracts/enumivolib/serialize.hpp
diff --git a/contracts/eosiolib/singleton.hpp b/contracts/enumivolib/singleton.hpp
similarity index 96%
rename from contracts/eosiolib/singleton.hpp
rename to contracts/enumivolib/singleton.hpp
index 4ef755e8d1b..b70c41235bb 100644
--- a/contracts/eosiolib/singleton.hpp
+++ b/contracts/enumivolib/singleton.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include <eosiolib/multi_index.hpp>
-#include <eosiolib/system.h>
+#include <enumivolib/multi_index.hpp>
+#include <enumivolib/system.h>
 
 namespace  eosio {
 
diff --git a/contracts/eosiolib/stdlib.hpp b/contracts/enumivolib/stdlib.hpp
similarity index 100%
rename from contracts/eosiolib/stdlib.hpp
rename to contracts/enumivolib/stdlib.hpp
diff --git a/contracts/eosiolib/system.h b/contracts/enumivolib/system.h
similarity index 98%
rename from contracts/eosiolib/system.h
rename to contracts/enumivolib/system.h
index cd14a7d1267..e938394f0e5 100644
--- a/contracts/eosiolib/system.h
+++ b/contracts/enumivolib/system.h
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #pragma once
-#include <eosiolib/types.h>
+#include <enumivolib/types.h>
 
 extern "C" {
 
diff --git a/contracts/eosiolib/transaction.h b/contracts/enumivolib/transaction.h
similarity index 99%
rename from contracts/eosiolib/transaction.h
rename to contracts/enumivolib/transaction.h
index 2eba3b9f853..e857beebf8a 100644
--- a/contracts/eosiolib/transaction.h
+++ b/contracts/enumivolib/transaction.h
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #pragma once
-#include <eosiolib/types.h>
+#include <enumivolib/types.h>
 
 extern "C" {
    /**
diff --git a/contracts/eosiolib/transaction.hpp b/contracts/enumivolib/transaction.hpp
similarity index 94%
rename from contracts/eosiolib/transaction.hpp
rename to contracts/enumivolib/transaction.hpp
index b7902396243..b89380d564f 100644
--- a/contracts/eosiolib/transaction.hpp
+++ b/contracts/enumivolib/transaction.hpp
@@ -3,11 +3,11 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #pragma once
-#include <eosiolib/transaction.h>
-#include <eosiolib/action.hpp>
-#include <eosiolib/print.hpp>
-#include <eosiolib/types.hpp>
-#include <eosiolib/serialize.hpp>
+#include <enumivolib/transaction.h>
+#include <enumivolib/action.hpp>
+#include <enumivolib/print.hpp>
+#include <enumivolib/types.hpp>
+#include <enumivolib/serialize.hpp>
 #include <vector>
 
 namespace eosio {
diff --git a/contracts/eosiolib/types.h b/contracts/enumivolib/types.h
similarity index 100%
rename from contracts/eosiolib/types.h
rename to contracts/enumivolib/types.h
diff --git a/contracts/eosiolib/types.hpp b/contracts/enumivolib/types.hpp
similarity index 98%
rename from contracts/eosiolib/types.hpp
rename to contracts/enumivolib/types.hpp
index cc65059548e..041f52add0b 100644
--- a/contracts/eosiolib/types.hpp
+++ b/contracts/enumivolib/types.hpp
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #pragma once
-#include <eosiolib/types.h>
+#include <enumivolib/types.h>
 #include <functional>
 #include <tuple>
 
diff --git a/contracts/eosiolib/varint.hpp b/contracts/enumivolib/varint.hpp
similarity index 100%
rename from contracts/eosiolib/varint.hpp
rename to contracts/enumivolib/varint.hpp
diff --git a/contracts/eosiolib/vector.hpp b/contracts/enumivolib/vector.hpp
similarity index 67%
rename from contracts/eosiolib/vector.hpp
rename to contracts/enumivolib/vector.hpp
index a6aa811d222..7cf97828fe7 100644
--- a/contracts/eosiolib/vector.hpp
+++ b/contracts/enumivolib/vector.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include <eosiolib/memory.hpp>
-#include <eosiolib/stdlib.hpp>
+#include <enumivolib/memory.hpp>
+#include <enumivolib/stdlib.hpp>
 #include <vector>
 
 namespace eosio {
diff --git a/contracts/eosio.bios/CMakeLists.txt b/contracts/eosio.bios/CMakeLists.txt
index ae5ea158406..f4545574c86 100644
--- a/contracts/eosio.bios/CMakeLists.txt
+++ b/contracts/eosio.bios/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET eosio.bios
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/eosio.bios/eosio.bios.hpp b/contracts/eosio.bios/eosio.bios.hpp
index bb67f8fb49a..40f5095ad43 100644
--- a/contracts/eosio.bios/eosio.bios.hpp
+++ b/contracts/eosio.bios/eosio.bios.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/privileged.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/privileged.hpp>
 
 namespace eosio {
 
diff --git a/contracts/eosio.msig/CMakeLists.txt b/contracts/eosio.msig/CMakeLists.txt
index afcf7038f1a..c7c8a7ddf70 100644
--- a/contracts/eosio.msig/CMakeLists.txt
+++ b/contracts/eosio.msig/CMakeLists.txt
@@ -4,6 +4,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET eosio.msig
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/eosio.msig/eosio.msig.cpp b/contracts/eosio.msig/eosio.msig.cpp
index 68286ad1416..298b24e374d 100644
--- a/contracts/eosio.msig/eosio.msig.cpp
+++ b/contracts/eosio.msig/eosio.msig.cpp
@@ -1,6 +1,6 @@
 #include <eosio.msig/eosio.msig.hpp>
-#include <eosiolib/action.hpp>
-#include <eosiolib/permission.hpp>
+#include <enumivolib/action.hpp>
+#include <enumivolib/permission.hpp>
 
 namespace eosio {
 
diff --git a/contracts/eosio.msig/eosio.msig.hpp b/contracts/eosio.msig/eosio.msig.hpp
index eada4d2e6fe..7c729948504 100644
--- a/contracts/eosio.msig/eosio.msig.hpp
+++ b/contracts/eosio.msig/eosio.msig.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/transaction.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/transaction.hpp>
 
 namespace eosio {
 
diff --git a/contracts/eosio.system/CMakeLists.txt b/contracts/eosio.system/CMakeLists.txt
index eb4ff749f77..667251bb3a7 100644
--- a/contracts/eosio.system/CMakeLists.txt
+++ b/contracts/eosio.system/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET eosio.system
   INCLUDE_FOLDERS ${STANDARD_INCLUDE_FOLDERS}
-  LIBRARIES libc++ libc eosiolib eosio.token
+  LIBRARIES libc++ libc enumivolib eosio.token
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/eosio.system/delegate_bandwidth.cpp b/contracts/eosio.system/delegate_bandwidth.cpp
index 8ddfa22c7c5..d1979127fe6 100644
--- a/contracts/eosio.system/delegate_bandwidth.cpp
+++ b/contracts/eosio.system/delegate_bandwidth.cpp
@@ -4,13 +4,13 @@
  */
 #include "eosio.system.hpp"
 
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/print.hpp>
-#include <eosiolib/datastream.hpp>
-#include <eosiolib/serialize.hpp>
-#include <eosiolib/multi_index.hpp>
-#include <eosiolib/privileged.h>
-#include <eosiolib/transaction.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/print.hpp>
+#include <enumivolib/datastream.hpp>
+#include <enumivolib/serialize.hpp>
+#include <enumivolib/multi_index.hpp>
+#include <enumivolib/privileged.h>
+#include <enumivolib/transaction.hpp>
 
 #include <eosio.token/eosio.token.hpp>
 
diff --git a/contracts/eosio.system/eosio.system.cpp b/contracts/eosio.system/eosio.system.cpp
index a24d0bf10c6..6ced04a858a 100644
--- a/contracts/eosio.system/eosio.system.cpp
+++ b/contracts/eosio.system/eosio.system.cpp
@@ -1,5 +1,5 @@
 #include "eosio.system.hpp"
-#include <eosiolib/dispatcher.hpp>
+#include <enumivolib/dispatcher.hpp>
 
 #include "delegate_bandwidth.cpp"
 #include "producer_pay.cpp"
diff --git a/contracts/eosio.system/eosio.system.hpp b/contracts/eosio.system/eosio.system.hpp
index 41a10d792e7..c879802128f 100644
--- a/contracts/eosio.system/eosio.system.hpp
+++ b/contracts/eosio.system/eosio.system.hpp
@@ -5,9 +5,9 @@
 #pragma once
 
 #include <eosio.system/native.hpp>
-#include <eosiolib/asset.hpp>
-#include <eosiolib/privileged.hpp>
-#include <eosiolib/singleton.hpp>
+#include <enumivolib/asset.hpp>
+#include <enumivolib/privileged.hpp>
+#include <enumivolib/singleton.hpp>
 #include <eosio.system/exchange_state.hpp>
 
 #include <string>
diff --git a/contracts/eosio.system/exchange_state.hpp b/contracts/eosio.system/exchange_state.hpp
index 3705a9b8b98..5d54aa2cca6 100644
--- a/contracts/eosio.system/exchange_state.hpp
+++ b/contracts/eosio.system/exchange_state.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eosiolib/asset.hpp>
+#include <enumivolib/asset.hpp>
 
 namespace eosiosystem {
    using eosio::asset;
diff --git a/contracts/eosio.system/native.hpp b/contracts/eosio.system/native.hpp
index 18c89cdc4a2..3afc14045c7 100644
--- a/contracts/eosio.system/native.hpp
+++ b/contracts/eosio.system/native.hpp
@@ -4,14 +4,14 @@
  */
 #pragma once
 
-#include <eosiolib/action.hpp>
-#include <eosiolib/public_key.hpp>
-#include <eosiolib/types.hpp>
-#include <eosiolib/print.hpp>
-#include <eosiolib/privileged.h>
-#include <eosiolib/optional.hpp>
-#include <eosiolib/producer_schedule.hpp>
-#include <eosiolib/contract.hpp>
+#include <enumivolib/action.hpp>
+#include <enumivolib/public_key.hpp>
+#include <enumivolib/types.hpp>
+#include <enumivolib/print.hpp>
+#include <enumivolib/privileged.h>
+#include <enumivolib/optional.hpp>
+#include <enumivolib/producer_schedule.hpp>
+#include <enumivolib/contract.hpp>
 
 namespace eosiosystem {
    using eosio::permission_level;
diff --git a/contracts/eosio.system/voting.cpp b/contracts/eosio.system/voting.cpp
index 99f43ecb3f4..5c5cca81410 100644
--- a/contracts/eosio.system/voting.cpp
+++ b/contracts/eosio.system/voting.cpp
@@ -4,15 +4,15 @@
  */
 #include "eosio.system.hpp"
 
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/crypto.h>
-#include <eosiolib/print.hpp>
-#include <eosiolib/datastream.hpp>
-#include <eosiolib/serialize.hpp>
-#include <eosiolib/multi_index.hpp>
-#include <eosiolib/privileged.hpp>
-#include <eosiolib/singleton.hpp>
-#include <eosiolib/transaction.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/crypto.h>
+#include <enumivolib/print.hpp>
+#include <enumivolib/datastream.hpp>
+#include <enumivolib/serialize.hpp>
+#include <enumivolib/multi_index.hpp>
+#include <enumivolib/privileged.hpp>
+#include <enumivolib/singleton.hpp>
+#include <enumivolib/transaction.hpp>
 #include <eosio.token/eosio.token.hpp>
 
 #include <algorithm>
diff --git a/contracts/eosio.token/CMakeLists.txt b/contracts/eosio.token/CMakeLists.txt
index 00ab99ec249..863b5577f49 100644
--- a/contracts/eosio.token/CMakeLists.txt
+++ b/contracts/eosio.token/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET eosio.token
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/eosio.token/eosio.token.hpp b/contracts/eosio.token/eosio.token.hpp
index d9e4cc3485e..752e6ebb0d0 100644
--- a/contracts/eosio.token/eosio.token.hpp
+++ b/contracts/eosio.token/eosio.token.hpp
@@ -4,8 +4,8 @@
  */
 #pragma once
 
-#include <eosiolib/asset.hpp>
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/asset.hpp>
+#include <enumivolib/eosio.hpp>
 
 #include <string>
 
diff --git a/contracts/eosiolib/eosio.hpp b/contracts/eosiolib/eosio.hpp
deleted file mode 100644
index 3e850a69dea..00000000000
--- a/contracts/eosiolib/eosio.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- *  @file
- *  @copyright defined in eos/LICENSE.txt
- */
-#pragma once
-#include <eosiolib/types.hpp>
-#include <eosiolib/action.hpp>
-#include <eosiolib/print.hpp>
-#include <eosiolib/multi_index.hpp>
-#include <eosiolib/dispatcher.hpp>
-#include <eosiolib/contract.hpp>
diff --git a/contracts/exchange/CMakeLists.txt b/contracts/exchange/CMakeLists.txt
index c855872ef5d..da6f545b24c 100644
--- a/contracts/exchange/CMakeLists.txt
+++ b/contracts/exchange/CMakeLists.txt
@@ -1,7 +1,7 @@
 file(GLOB ABI_FILES "*.abi")
 add_wast_executable(TARGET exchange
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
diff --git a/contracts/exchange/exchange.cpp b/contracts/exchange/exchange.cpp
index d68484011c5..687f93761ce 100644
--- a/contracts/exchange/exchange.cpp
+++ b/contracts/exchange/exchange.cpp
@@ -5,7 +5,7 @@
 #include "exchange_accounts.cpp"
 #include "market_state.cpp"
 
-#include <eosiolib/dispatcher.hpp>
+#include <enumivolib/dispatcher.hpp>
 
 namespace eosio {
 
diff --git a/contracts/exchange/exchange.hpp b/contracts/exchange/exchange.hpp
index d619c13d65e..ff31ba152ca 100644
--- a/contracts/exchange/exchange.hpp
+++ b/contracts/exchange/exchange.hpp
@@ -1,5 +1,5 @@
-#include <eosiolib/types.hpp>
-#include <eosiolib/currency.hpp>
+#include <enumivolib/types.hpp>
+#include <enumivolib/currency.hpp>
 #include <boost/container/flat_map.hpp>
 #include <cmath>
 #include <exchange/market_state.hpp>
diff --git a/contracts/exchange/exchange_accounts.hpp b/contracts/exchange/exchange_accounts.hpp
index 2ec6027c5ec..9d9eaa16e5c 100644
--- a/contracts/exchange/exchange_accounts.hpp
+++ b/contracts/exchange/exchange_accounts.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include <eosiolib/asset.hpp>
-#include <eosiolib/multi_index.hpp>
+#include <enumivolib/asset.hpp>
+#include <enumivolib/multi_index.hpp>
 
 namespace eosio {
 
diff --git a/contracts/exchange/exchange_state.hpp b/contracts/exchange/exchange_state.hpp
index 1d102578062..17e4cf4ad85 100644
--- a/contracts/exchange/exchange_state.hpp
+++ b/contracts/exchange/exchange_state.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eosiolib/asset.hpp>
+#include <enumivolib/asset.hpp>
 
 namespace eosio {
 
diff --git a/contracts/hello/CMakeLists.txt b/contracts/hello/CMakeLists.txt
index 5cd15332331..57e43a84c00 100644
--- a/contracts/hello/CMakeLists.txt
+++ b/contracts/hello/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET hello
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc libc++ eosiolib
+  LIBRARIES libc libc++ enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/hello/hello.cpp b/contracts/hello/hello.cpp
index 7c52afa9b60..a4e74cc968c 100644
--- a/contracts/hello/hello.cpp
+++ b/contracts/hello/hello.cpp
@@ -1,4 +1,4 @@
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 using namespace eosio;
 
 class hello : public eosio::contract {
diff --git a/contracts/identity/CMakeLists.txt b/contracts/identity/CMakeLists.txt
index 230adcda29c..4c952789a9d 100644
--- a/contracts/identity/CMakeLists.txt
+++ b/contracts/identity/CMakeLists.txt
@@ -4,20 +4,20 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 add_wast_library(TARGET identity_common
   SOURCE_FILES common.cpp
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 add_wast_executable(TARGET identity
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES identity_common libc++ libc eosiolib
+  LIBRARIES identity_common libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 add_wast_library(TARGET identity_interface
   SOURCE_FILES interface.cpp
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES identity_common libc++ libc eosiolib
+  LIBRARIES identity_common libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/contracts/identity/common.cpp b/contracts/identity/common.cpp
index 68e48bc6adb..d0a33fb802e 100644
--- a/contracts/identity/common.cpp
+++ b/contracts/identity/common.cpp
@@ -1,6 +1,6 @@
 #include "common.hpp"
 
-#include <eosiolib/chain.h>
+#include <enumivolib/chain.h>
 
 namespace identity {
 
diff --git a/contracts/identity/common.hpp b/contracts/identity/common.hpp
index 48d8cf39f9e..1fe7ca4a0c2 100644
--- a/contracts/identity/common.hpp
+++ b/contracts/identity/common.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <eosiolib/singleton.hpp>
-#include <eosiolib/multi_index.hpp>
+#include <enumivolib/singleton.hpp>
+#include <enumivolib/multi_index.hpp>
 
 namespace identity {
 
diff --git a/contracts/identity/identity.cpp b/contracts/identity/identity.cpp
index c33cd66d526..dbac85bf951 100644
--- a/contracts/identity/identity.cpp
+++ b/contracts/identity/identity.cpp
@@ -1,8 +1,8 @@
 #include "common.hpp"
 
-#include <eosiolib/contract.hpp>
-#include <eosiolib/dispatcher.hpp>
-#include <eosiolib/vector.hpp>
+#include <enumivolib/contract.hpp>
+#include <enumivolib/dispatcher.hpp>
+#include <enumivolib/vector.hpp>
 
 namespace identity {
    using eosio::action_meta;
diff --git a/contracts/identity/test/CMakeLists.txt b/contracts/identity/test/CMakeLists.txt
index 739341339a1..249d02bef83 100644
--- a/contracts/identity/test/CMakeLists.txt
+++ b/contracts/identity/test/CMakeLists.txt
@@ -2,6 +2,6 @@ set(ABI_FILES "identity_test.abi")
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 add_wast_executable(TARGET identity_test
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES identity_interface identity_common libc++ libc eosiolib
+  LIBRARIES identity_interface identity_common libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/identity/test/identity_test.cpp b/contracts/identity/test/identity_test.cpp
index 4688d4db4db..b0e9b7e281b 100644
--- a/contracts/identity/test/identity_test.cpp
+++ b/contracts/identity/test/identity_test.cpp
@@ -1,6 +1,6 @@
-#include <eosiolib/action.h>
-#include <eosiolib/contract.hpp>
-#include <eosiolib/dispatcher.hpp>
+#include <enumivolib/action.h>
+#include <enumivolib/contract.hpp>
+#include <enumivolib/dispatcher.hpp>
 #include <identity/interface.hpp>
 
 namespace identity_test {
diff --git a/contracts/infinite/CMakeLists.txt b/contracts/infinite/CMakeLists.txt
index af3ec44f496..ecfce353d9a 100644
--- a/contracts/infinite/CMakeLists.txt
+++ b/contracts/infinite/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_wast_executable(TARGET infinite
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/infinite/infinite.cpp b/contracts/infinite/infinite.cpp
index 21a542c1a28..54e2fbfee0e 100644
--- a/contracts/infinite/infinite.cpp
+++ b/contracts/infinite/infinite.cpp
@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/print.hpp> /// defines transfer struct (abi)
+#include <enumivolib/print.hpp> /// defines transfer struct (abi)
 
 extern "C" {
 
diff --git a/contracts/multi_index_test/CMakeLists.txt b/contracts/multi_index_test/CMakeLists.txt
index 40a4eef16fd..079c49a369a 100644
--- a/contracts/multi_index_test/CMakeLists.txt
+++ b/contracts/multi_index_test/CMakeLists.txt
@@ -2,7 +2,7 @@ file(GLOB ABI_FILES "*.abi")
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 add_wast_executable(TARGET multi_index_test
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/contracts/multi_index_test/multi_index_test.cpp b/contracts/multi_index_test/multi_index_test.cpp
index 19bbf653de8..e169ff80527 100644
--- a/contracts/multi_index_test/multi_index_test.cpp
+++ b/contracts/multi_index_test/multi_index_test.cpp
@@ -1,6 +1,6 @@
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/dispatcher.hpp>
-#include <eosiolib/multi_index.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/dispatcher.hpp>
+#include <enumivolib/multi_index.hpp>
 
 using namespace eosio;
 
diff --git a/contracts/musl/upstream b/contracts/musl/upstream
index 8a34536ac97..d7e3bd1ed4c 160000
--- a/contracts/musl/upstream
+++ b/contracts/musl/upstream
@@ -1 +1 @@
-Subproject commit 8a34536ac9764c90c86cc0b62d0cda07449fd5d8
+Subproject commit d7e3bd1ed4c296b2028b60af9abb1d3899e47364
diff --git a/contracts/noop/CMakeLists.txt b/contracts/noop/CMakeLists.txt
index 6aadc90d01b..c8d73727572 100644
--- a/contracts/noop/CMakeLists.txt
+++ b/contracts/noop/CMakeLists.txt
@@ -2,7 +2,7 @@ file(GLOB ABI_FILES "*.abi")
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 add_wast_executable(TARGET noop
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/contracts/noop/noop.cpp b/contracts/noop/noop.cpp
index 67f3f101f14..a409f4497bc 100644
--- a/contracts/noop/noop.cpp
+++ b/contracts/noop/noop.cpp
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 
 namespace eosio {
 
diff --git a/contracts/payloadless/CMakeLists.txt b/contracts/payloadless/CMakeLists.txt
index 16bad40cb27..e2205e487ca 100644
--- a/contracts/payloadless/CMakeLists.txt
+++ b/contracts/payloadless/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET payloadless
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc libc++ eosiolib
+  LIBRARIES libc libc++ enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/payloadless/payloadless.cpp b/contracts/payloadless/payloadless.cpp
index b67c7e23b3a..53b2c490b26 100644
--- a/contracts/payloadless/payloadless.cpp
+++ b/contracts/payloadless/payloadless.cpp
@@ -1,5 +1,5 @@
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/print.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/print.hpp>
 using namespace eosio;
 
 class payloadless : public eosio::contract {
diff --git a/contracts/proxy/CMakeLists.txt b/contracts/proxy/CMakeLists.txt
index ad554e4dd16..69fd90b0f92 100644
--- a/contracts/proxy/CMakeLists.txt
+++ b/contracts/proxy/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET proxy
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}" ${Boost_INCLUDE_DIR} 
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/proxy/proxy.cpp b/contracts/proxy/proxy.cpp
index 5217ae51356..8e7ba3fe046 100644
--- a/contracts/proxy/proxy.cpp
+++ b/contracts/proxy/proxy.cpp
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 #include <proxy/proxy.hpp>
-#include <eosiolib/transaction.hpp>
+#include <enumivolib/transaction.hpp>
 #include <eosio.token/eosio.token.hpp>
 
 namespace proxy {
diff --git a/contracts/proxy/proxy.hpp b/contracts/proxy/proxy.hpp
index fd439e3c274..0d65cc056dd 100644
--- a/contracts/proxy/proxy.hpp
+++ b/contracts/proxy/proxy.hpp
@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 
 namespace proxy {
 
diff --git a/contracts/simple.token/CMakeLists.txt b/contracts/simple.token/CMakeLists.txt
index 1e755eabe2f..93430bbda22 100644
--- a/contracts/simple.token/CMakeLists.txt
+++ b/contracts/simple.token/CMakeLists.txt
@@ -4,6 +4,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET simple.token
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/simple.token/simple.token.cpp b/contracts/simple.token/simple.token.cpp
index 1f2ab97feca..9d1bfad4c97 100644
--- a/contracts/simple.token/simple.token.cpp
+++ b/contracts/simple.token/simple.token.cpp
@@ -1,4 +1,4 @@
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 
 class simpletoken : public eosio::contract {
    public:
diff --git a/contracts/skeleton/skeleton.cpp b/contracts/skeleton/skeleton.cpp
index a4ad22e1f1b..5e588f7aafd 100644
--- a/contracts/skeleton/skeleton.cpp
+++ b/contracts/skeleton/skeleton.cpp
@@ -1,4 +1,4 @@
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 
 using namespace eosio;
 
diff --git a/contracts/skeleton/skeleton.hpp b/contracts/skeleton/skeleton.hpp
index ec28c3d168b..db173a86d6c 100644
--- a/contracts/skeleton/skeleton.hpp
+++ b/contracts/skeleton/skeleton.hpp
@@ -2,6 +2,6 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 
 
diff --git a/contracts/social/CMakeLists.txt b/contracts/social/CMakeLists.txt
index 72d5d9e059e..937de6e7834 100644
--- a/contracts/social/CMakeLists.txt
+++ b/contracts/social/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_wast_executable(TARGET social
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES eosiolib
+  LIBRARIES enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/stltest/CMakeLists.txt b/contracts/stltest/CMakeLists.txt
index 81d615ebbf2..a0940b57183 100644
--- a/contracts/stltest/CMakeLists.txt
+++ b/contracts/stltest/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(ABI_FILES "stltest.abi")
 add_wast_executable(TARGET stltest
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/contracts/stltest/stltest.cpp b/contracts/stltest/stltest.cpp
index 79828877f98..fd850e94229 100644
--- a/contracts/stltest/stltest.cpp
+++ b/contracts/stltest/stltest.cpp
@@ -135,8 +135,8 @@
 #include <string>
 #include <stdexcept>
 */
-//include <eosiolib/eos.hpp>
-#include <eosiolib/dispatcher.hpp>
+//include <enumivolib/eos.hpp>
+#include <enumivolib/dispatcher.hpp>
 
 using namespace eosio;
 /*
diff --git a/contracts/test.inline/CMakeLists.txt b/contracts/test.inline/CMakeLists.txt
index 9b7d8dcb425..0e70d15761c 100644
--- a/contracts/test.inline/CMakeLists.txt
+++ b/contracts/test.inline/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET test.inline
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/test.inline/test.inline.hpp b/contracts/test.inline/test.inline.hpp
index 96788107914..df05123c6e2 100644
--- a/contracts/test.inline/test.inline.hpp
+++ b/contracts/test.inline/test.inline.hpp
@@ -1,6 +1,6 @@
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/privileged.h>
-#include <eosiolib/producer_schedule.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/privileged.h>
+#include <enumivolib/producer_schedule.hpp>
 
 namespace eosio {
 
diff --git a/contracts/test_api/CMakeLists.txt b/contracts/test_api/CMakeLists.txt
index 9ecff619e09..1b0239d54d8 100644
--- a/contracts/test_api/CMakeLists.txt
+++ b/contracts/test_api/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 add_wast_executable(TARGET test_api
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
   MAX_MEMORY 1048576
 )
diff --git a/contracts/test_api/test_action.cpp b/contracts/test_api/test_action.cpp
index 3ff1c521f6b..6be2d73414f 100644
--- a/contracts/test_api/test_action.cpp
+++ b/contracts/test_api/test_action.cpp
@@ -2,16 +2,16 @@
  * @file action_test.cpp
  * @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/action.hpp>
-#include <eosiolib/transaction.hpp>
-#include <eosiolib/chain.h>
-#include <eosiolib/db.h>
-#include <eosiolib/crypto.h>
-#include <eosiolib/privileged.h>
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/datastream.hpp>
-#include <eosiolib/print.hpp>
-#include <eosiolib/compiler_builtins.h>
+#include <enumivolib/action.hpp>
+#include <enumivolib/transaction.hpp>
+#include <enumivolib/chain.h>
+#include <enumivolib/db.h>
+#include <enumivolib/crypto.h>
+#include <enumivolib/privileged.h>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/datastream.hpp>
+#include <enumivolib/print.hpp>
+#include <enumivolib/compiler_builtins.h>
 #include "test_api.hpp"
 
 void test_action::read_action_normal() {
diff --git a/contracts/test_api/test_api.cpp b/contracts/test_api/test_api.cpp
index 6fbc6ac4c74..974018d6704 100644
--- a/contracts/test_api/test_api.cpp
+++ b/contracts/test_api/test_api.cpp
@@ -2,8 +2,8 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/transaction.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/transaction.hpp>
 
 #include "test_api.hpp"
 #include "test_action.cpp"
diff --git a/contracts/test_api/test_api.hpp b/contracts/test_api/test_api.hpp
index cc6f3f22ae7..b389c66e48e 100644
--- a/contracts/test_api/test_api.hpp
+++ b/contracts/test_api/test_api.hpp
@@ -12,9 +12,9 @@ namespace eosio {
 }
 
 
-//#include <eosiolib/transaction.hpp>
+//#include <enumivolib/transaction.hpp>
 
-// NOTE: including eosiolib/transaction.hpp here causes !"unresolvable": env._ZNKSt3__120__vector_base_commonILb1EE20__throw_length_errorEv
+// NOTE: including enumivolib/transaction.hpp here causes !"unresolvable": env._ZNKSt3__120__vector_base_commonILb1EE20__throw_length_errorEv
 //       errors in api_tests/memory_tests
 
 #define WASM_TEST_HANDLER(CLASS, METHOD) \
diff --git a/contracts/test_api/test_api_common.hpp b/contracts/test_api/test_api_common.hpp
index 8d63a535089..21411bd01a4 100644
--- a/contracts/test_api/test_api_common.hpp
+++ b/contracts/test_api/test_api_common.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #ifdef DISABLE_EOSLIB_SERIALIZE
-#include <eosiolib/serialize.hpp>
+#include <enumivolib/serialize.hpp>
 #undef EOSLIB_SERIALIZE
 #define EOSLIB_SERIALIZE(...)
 #endif
diff --git a/contracts/test_api/test_chain.cpp b/contracts/test_api/test_chain.cpp
index 6c71eb78eda..1ae834105d5 100644
--- a/contracts/test_api/test_chain.cpp
+++ b/contracts/test_api/test_chain.cpp
@@ -2,9 +2,9 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/action.h>
-#include <eosiolib/chain.h>
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/action.h>
+#include <enumivolib/chain.h>
+#include <enumivolib/eosio.hpp>
 #include "test_api.hpp"
 
 #pragma pack(push, 1)
diff --git a/contracts/test_api/test_checktime.cpp b/contracts/test_api/test_checktime.cpp
index 7c2a4403955..476b25d182b 100644
--- a/contracts/test_api/test_checktime.cpp
+++ b/contracts/test_api/test_checktime.cpp
@@ -3,7 +3,7 @@
  * @copyright defined in eos/LICENSE.txt
  */
 
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 #include "test_api.hpp"
 
 void test_checktime::checktime_pass() {
diff --git a/contracts/test_api/test_compiler_builtins.cpp b/contracts/test_api/test_compiler_builtins.cpp
index 1492110b82e..aada65f0e41 100644
--- a/contracts/test_api/test_compiler_builtins.cpp
+++ b/contracts/test_api/test_compiler_builtins.cpp
@@ -3,9 +3,9 @@
  *    @copyright defined in eos/LICENSE.txt
  */
 
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/print.hpp>
-#include <eosiolib/compiler_builtins.h>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/print.hpp>
+#include <enumivolib/compiler_builtins.h>
 
 #include "test_api.hpp"
 
diff --git a/contracts/test_api/test_crypto.cpp b/contracts/test_api/test_crypto.cpp
index 526ec4170af..655c778feb0 100644
--- a/contracts/test_api/test_crypto.cpp
+++ b/contracts/test_api/test_crypto.cpp
@@ -2,9 +2,9 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/crypto.h>
-#include <eosiolib/print.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/crypto.h>
+#include <enumivolib/print.hpp>
 
 #include "test_api.hpp"
 #define WASM_TEST_FAIL 1
diff --git a/contracts/test_api/test_datastream.cpp b/contracts/test_api/test_datastream.cpp
index 0ae56b5f5c8..7a8091d7abc 100644
--- a/contracts/test_api/test_datastream.cpp
+++ b/contracts/test_api/test_datastream.cpp
@@ -1,6 +1,6 @@
 
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/datastream.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/datastream.hpp>
 
 #include "test_api.hpp"
 
diff --git a/contracts/test_api/test_fixedpoint.cpp b/contracts/test_api/test_fixedpoint.cpp
index 3f7c0260786..d9f59288bf7 100644
--- a/contracts/test_api/test_fixedpoint.cpp
+++ b/contracts/test_api/test_fixedpoint.cpp
@@ -1,5 +1,5 @@
-#include <eosiolib/fixedpoint.hpp>
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/fixedpoint.hpp>
+#include <enumivolib/eosio.hpp>
 
 #include "test_api.hpp"
 
diff --git a/contracts/test_api/test_permission.cpp b/contracts/test_api/test_permission.cpp
index b899bab9166..bb443077682 100644
--- a/contracts/test_api/test_permission.cpp
+++ b/contracts/test_api/test_permission.cpp
@@ -2,14 +2,14 @@
  * @file action_test.cpp
  * @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/permission.h>
-#include <eosiolib/db.h>
-
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/print.hpp>
-#include <eosiolib/compiler_builtins.h>
-#include <eosiolib/serialize.hpp>
-#include <eosiolib/action.hpp>
+#include <enumivolib/permission.h>
+#include <enumivolib/db.h>
+
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/print.hpp>
+#include <enumivolib/compiler_builtins.h>
+#include <enumivolib/serialize.hpp>
+#include <enumivolib/action.hpp>
 
 #include "test_api.hpp"
 
diff --git a/contracts/test_api/test_print.cpp b/contracts/test_api/test_print.cpp
index 05b5bede163..ecff291156f 100644
--- a/contracts/test_api/test_print.cpp
+++ b/contracts/test_api/test_print.cpp
@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 
 #include "test_api.hpp"
 
diff --git a/contracts/test_api/test_transaction.cpp b/contracts/test_api/test_transaction.cpp
index f1535a2369e..7b843e29508 100644
--- a/contracts/test_api/test_transaction.cpp
+++ b/contracts/test_api/test_transaction.cpp
@@ -2,9 +2,9 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/action.hpp>
-#include <eosiolib/crypto.h>
-#include <eosiolib/transaction.hpp>
+#include <enumivolib/action.hpp>
+#include <enumivolib/crypto.h>
+#include <enumivolib/transaction.hpp>
 
 #include "test_api.hpp"
 
diff --git a/contracts/test_api/test_types.cpp b/contracts/test_api/test_types.cpp
index 3889721aeee..77206fdb08f 100644
--- a/contracts/test_api/test_types.cpp
+++ b/contracts/test_api/test_types.cpp
@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 
 #include "test_api.hpp"
 
diff --git a/contracts/test_api_db/CMakeLists.txt b/contracts/test_api_db/CMakeLists.txt
index 0121439dbf1..8806d54cc92 100644
--- a/contracts/test_api_db/CMakeLists.txt
+++ b/contracts/test_api_db/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_wast_executable(TARGET test_api_db
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/test_api_db/test_api_db.cpp b/contracts/test_api_db/test_api_db.cpp
index 706734ba967..efe73af9067 100644
--- a/contracts/test_api_db/test_api_db.cpp
+++ b/contracts/test_api_db/test_api_db.cpp
@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 #include "../test_api/test_api.hpp"
 
 #include "test_db.cpp"
diff --git a/contracts/test_api_db/test_db.cpp b/contracts/test_api_db/test_db.cpp
index 1743a907da7..2d00f51014a 100644
--- a/contracts/test_api_db/test_db.cpp
+++ b/contracts/test_api_db/test_db.cpp
@@ -1,10 +1,10 @@
-#include <eosiolib/types.hpp>
-#include <eosiolib/action.hpp>
-#include <eosiolib/transaction.hpp>
-#include <eosiolib/datastream.hpp>
-#include <eosiolib/db.h>
-#include <eosiolib/memory.hpp>
-#include <eosiolib/fixed_key.hpp>
+#include <enumivolib/types.hpp>
+#include <enumivolib/action.hpp>
+#include <enumivolib/transaction.hpp>
+#include <enumivolib/datastream.hpp>
+#include <enumivolib/db.h>
+#include <enumivolib/memory.hpp>
+#include <enumivolib/fixed_key.hpp>
 #include "../test_api/test_api.hpp"
 
 int primary[11]      = {0,1,2,3,4,5,6,7,8,9,10};
diff --git a/contracts/test_api_mem/CMakeLists.txt b/contracts/test_api_mem/CMakeLists.txt
index fc0d40f21e4..9e04471ee9c 100644
--- a/contracts/test_api_mem/CMakeLists.txt
+++ b/contracts/test_api_mem/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 add_wast_executable( TARGET test_api_mem
    INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-   LIBRARIES eosiolib
+   LIBRARIES enumivolib
    DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
    MAX_MEMORY 1048576
 )
diff --git a/contracts/test_api_mem/test_api_mem.cpp b/contracts/test_api_mem/test_api_mem.cpp
index e01bba16378..4e1b9761c6e 100644
--- a/contracts/test_api_mem/test_api_mem.cpp
+++ b/contracts/test_api_mem/test_api_mem.cpp
@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 #include "../test_api/test_api.hpp"
 
 #include "test_extended_memory.cpp"
diff --git a/contracts/test_api_mem/test_extended_memory.cpp b/contracts/test_api_mem/test_extended_memory.cpp
index 7fac1eeae2b..e699ad673f5 100644
--- a/contracts/test_api_mem/test_extended_memory.cpp
+++ b/contracts/test_api_mem/test_extended_memory.cpp
@@ -1,5 +1,5 @@
-#include <eosiolib/eosio.hpp>
-#include <eosiolib/memory.hpp>
+#include <enumivolib/eosio.hpp>
+#include <enumivolib/memory.hpp>
 #include "../test_api/test_api.hpp"
 
 //using namespace eosio;
diff --git a/contracts/test_api_mem/test_memory.cpp b/contracts/test_api_mem/test_memory.cpp
index d3f387fd8b1..5f5c79295f2 100644
--- a/contracts/test_api_mem/test_memory.cpp
+++ b/contracts/test_api_mem/test_memory.cpp
@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 
-#include <eosiolib/memory.hpp>
+#include <enumivolib/memory.hpp>
 
 
 void verify_mem(const void* const ptr, const uint32_t val, const uint32_t size)
diff --git a/contracts/test_api_multi_index/CMakeLists.txt b/contracts/test_api_multi_index/CMakeLists.txt
index b6906b0fb34..f8640f5a0d6 100644
--- a/contracts/test_api_multi_index/CMakeLists.txt
+++ b/contracts/test_api_multi_index/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_wast_executable(TARGET test_api_multi_index
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/test_api_multi_index/test_api_multi_index.cpp b/contracts/test_api_multi_index/test_api_multi_index.cpp
index cbc629ed9b8..841f2d953cb 100644
--- a/contracts/test_api_multi_index/test_api_multi_index.cpp
+++ b/contracts/test_api_multi_index/test_api_multi_index.cpp
@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 #include "../test_api/test_api.hpp"
 
 #include "test_multi_index.cpp"
diff --git a/contracts/test_api_multi_index/test_multi_index.cpp b/contracts/test_api_multi_index/test_multi_index.cpp
index 3467e2a28b7..e5c748d7211 100644
--- a/contracts/test_api_multi_index/test_multi_index.cpp
+++ b/contracts/test_api_multi_index/test_multi_index.cpp
@@ -1,6 +1,6 @@
-#include <eosiolib/multi_index.hpp>
+#include <enumivolib/multi_index.hpp>
 #include "../test_api/test_api.hpp"
-#include <eosiolib/print.hpp>
+#include <enumivolib/print.hpp>
 #include <boost/range/iterator_range.hpp>
 #include <limits>
 #include <cmath>
diff --git a/contracts/tic_tac_toe/CMakeLists.txt b/contracts/tic_tac_toe/CMakeLists.txt
index c98bfc2ae49..ed08b442759 100644
--- a/contracts/tic_tac_toe/CMakeLists.txt
+++ b/contracts/tic_tac_toe/CMakeLists.txt
@@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 
 add_wast_executable(TARGET tic_tac_toe
   INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
-  LIBRARIES libc++ libc eosiolib
+  LIBRARIES libc++ libc enumivolib
   DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/contracts/tic_tac_toe/tic_tac_toe.hpp b/contracts/tic_tac_toe/tic_tac_toe.hpp
index b9321a79751..5940436b14d 100644
--- a/contracts/tic_tac_toe/tic_tac_toe.hpp
+++ b/contracts/tic_tac_toe/tic_tac_toe.hpp
@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosiolib/eosio.hpp>
+#include <enumivolib/eosio.hpp>
 
 /**
  *  @defgroup tictactoecontract Tic Tac Toe Contract
diff --git a/eos.doxygen.in b/eos.doxygen.in
index 02f1d8b83f1..9d43343f018 100644
--- a/eos.doxygen.in
+++ b/eos.doxygen.in
@@ -171,7 +171,7 @@ INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 FILTER_SOURCE_PATTERNS =
-USE_MDFILE_AS_MAINPAGE = contracts/eosiolib/mainpage.md
+USE_MDFILE_AS_MAINPAGE = contracts/enumivolib/mainpage.md
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
 #---------------------------------------------------------------------------
diff --git a/tests/config.hpp.in b/tests/config.hpp.in
index 7010fb336a1..76d398ec2da 100644
--- a/tests/config.hpp.in
+++ b/tests/config.hpp.in
@@ -4,7 +4,7 @@
  */
 
 namespace eosio { namespace tests { namespace config {
-   constexpr char eosiolib_path[] = "${CMAKE_CURRENT_SOURCE_DIR}/../contracts";
+   constexpr char enumivolib_path[] = "${CMAKE_CURRENT_SOURCE_DIR}/../contracts";
    constexpr char pfr_include_path[] = "${CMAKE_CURRENT_SOURCE_DIR}/../externals/magic_get/include";
    constexpr char boost_include_path[] = "${Boost_INCLUDE_DIR}";
 }}}
diff --git a/tools/eosiocpp.in b/tools/eosiocpp.in
index 4dad00491fa..ffb0cd217d2 100755
--- a/tools/eosiocpp.in
+++ b/tools/eosiocpp.in
@@ -52,7 +52,7 @@ function build_contract {
     done
 
     ($PRINT_CMDS; @WASM_LLVM_LINK@ -only-needed -o $workdir/linked.bc $workdir/built/* \
-                                   ${EOSIO_INSTALL_DIR}/usr/share/eosio/contractsdk/lib/eosiolib.bc \
+                                   ${EOSIO_INSTALL_DIR}/usr/share/eosio/contractsdk/lib/enumivolib.bc \
                                    ${EOSIO_INSTALL_DIR}/usr/share/eosio/contractsdk/lib/libc++.bc \
                                    ${EOSIO_INSTALL_DIR}/usr/share/eosio/contractsdk/lib/libc.bc
 
diff --git a/unittests/abi_tests.cpp b/unittests/abi_tests.cpp
index 1f1dd6ef238..5cfd024861d 100644
--- a/unittests/abi_tests.cpp
+++ b/unittests/abi_tests.cpp
@@ -396,11 +396,11 @@ struct abi_gen_helper {
 
   bool generate_abi(const char* source, const char* abi, bool opt_sfs=false) {
 
-    std::string include_param = std::string("-I") + eosiolib_path;
+    std::string include_param = std::string("-I") + enumivolib_path;
     std::string pfr_include_param = std::string("-I") + pfr_include_path;
     std::string boost_include_param = std::string("-I") + boost_include_path;
-    std::string stdcpp_include_param = std::string("-I") + eosiolib_path + "/libc++/upstream/include";
-    std::string stdc_include_param = std::string("-I") + eosiolib_path +  "/musl/upstream/include";
+    std::string stdcpp_include_param = std::string("-I") + enumivolib_path + "/libc++/upstream/include";
+    std::string stdc_include_param = std::string("-I") + enumivolib_path +  "/musl/upstream/include";
 
     abi_def output;
 
@@ -444,7 +444,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_unknown_type, abi_gen_helper)
 { try {
 
    const char* unknown_type = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
    //@abi action
    struct transfer {
       uint64_t param1;
@@ -461,9 +461,9 @@ BOOST_FIXTURE_TEST_CASE(abigen_all_types, abi_gen_helper)
 
    const char* all_types = R"=====(
    #pragma GCC diagnostic ignored "-Wpointer-bool-conversion"
-   #include <eosiolib/types.hpp>
-   #include <eosiolib/asset.hpp>
-   #include <eosiolib/action.hpp>
+   #include <enumivolib/types.hpp>
+   #include <enumivolib/asset.hpp>
+   #include <enumivolib/action.hpp>
    #include <string>
 
    typedef eosio::symbol_type symbol;
@@ -609,7 +609,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_double_base, abi_gen_helper)
 { try {
 
    const char* double_base = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
    struct A {
       uint64_t param3;
@@ -633,7 +633,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_double_action, abi_gen_helper)
 { try {
 
    const char* double_action = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
    struct A {
       uint64_t param3;
@@ -697,7 +697,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_all_indexes, abi_gen_helper)
 { try {
 
    const char* all_indexes = R"=====(
-   #include <eosiolib/types.hpp>
+   #include <enumivolib/types.hpp>
    #include <string>
 
    using namespace eosio;
@@ -850,7 +850,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_unable_to_determine_index, abi_gen_helper)
 { try {
 
    const char* unable_to_determine_index = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
    //@abi table
    struct table1 {
@@ -870,7 +870,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_long_field_name, abi_gen_helper)
    //TODO: full action / full table
   // typedef fixed_string16 FieldName;
    const char* long_field_name = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
    //@abi table
    struct table1 {
@@ -887,7 +887,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_long_type_name, abi_gen_helper)
 { try {
 
    const char* long_type_name = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
    struct this_is_a_very_very_very_very_long_type_name {
       uint64_t field;
@@ -909,7 +909,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_same_type_different_namespace, abi_gen_helper)
 { try {
 
    const char* same_type_different_namespace = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
    namespace A {
      //@abi table
@@ -935,7 +935,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_bad_index_type, abi_gen_helper)
 { try {
 
    const char* bad_index_type = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
    //@abi table table1 i128i128
    struct table1 {
@@ -954,7 +954,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_full_table_decl, abi_gen_helper)
 { try {
 
    const char* full_table_decl = R"=====(
-   #include <eosiolib/types.hpp>
+   #include <enumivolib/types.hpp>
 
    //@abi table table1 i64
    class table1 {
@@ -1008,7 +1008,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_str_table_decl, abi_gen_helper)
 { try {
 
    const char* str_table_decl = R"=====(
-   #include <eosiolib/types.hpp>
+   #include <enumivolib/types.hpp>
    #include <string>
 
    //@abi table
@@ -1059,7 +1059,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_union_table, abi_gen_helper)
 { try {
 
    const char* union_table = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
    //@abi table
    union table1 {
@@ -1077,7 +1077,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_same_action_different_type, abi_gen_helper)
 { try {
 
    const char* same_action_different_type = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
    //@abi action action1
    struct table1 {
@@ -1098,7 +1098,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_template_base, abi_gen_helper)
 { try {
 
    const char* template_base = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
    template<typename T>
    class base {
@@ -1158,7 +1158,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_action_and_table, abi_gen_helper)
 { try {
 
    const char* action_and_table = R"=====(
-   #include <eosiolib/types.h>
+   #include <enumivolib/types.h>
 
   /* @abi table
    * @abi action
@@ -1210,7 +1210,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_simple_typedef, abi_gen_helper)
 { try {
 
    const char* simple_typedef = R"=====(
-   #include <eosiolib/types.hpp>
+   #include <enumivolib/types.hpp>
 
    using namespace eosio;
 
@@ -1273,7 +1273,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_field_typedef, abi_gen_helper)
 { try {
 
    const char* field_typedef = R"=====(
-   #include <eosiolib/types.hpp>
+   #include <enumivolib/types.hpp>
 
    using namespace eosio;
 
@@ -1354,7 +1354,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_vector_of_POD, abi_gen_helper)
    const char* abigen_vector_of_POD = R"=====(
    #include <vector>
    #include <string>
-   #include <eosiolib/types.hpp>
+   #include <enumivolib/types.hpp>
 
    using namespace eosio;
    using namespace std;
@@ -1422,7 +1422,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_vector_of_structs, abi_gen_helper)
    const char* abigen_vector_of_structs = R"=====(
    #include <vector>
    #include <string>
-   #include <eosiolib/types.hpp>
+   #include <enumivolib/types.hpp>
 
    using namespace eosio;
    using namespace std;
@@ -1506,7 +1506,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_vector_multidimension, abi_gen_helper)
    const char* abigen_vector_multidimension = R"=====(
    #include <vector>
    #include <string>
-   #include <eosiolib/types.hpp>
+   #include <enumivolib/types.hpp>
 
    using namespace eosio;
    using namespace std;
@@ -1529,8 +1529,8 @@ BOOST_FIXTURE_TEST_CASE(abgigen_vector_alias, abi_gen_helper)
    const char* abgigen_vector_alias = R"=====(
    #include <string>
    #include <vector>
-   #include <eosiolib/types.hpp>
-   #include <eosiolib/print.hpp>
+   #include <enumivolib/types.hpp>
+   #include <enumivolib/print.hpp>
 
    using namespace std;
 
@@ -1599,8 +1599,8 @@ BOOST_FIXTURE_TEST_CASE(abgigen_eosioabi_macro, abi_gen_helper)
       #pragma GCC diagnostic push
       #pragma GCC diagnostic ignored "-Wpointer-bool-conversion"
 
-      #include <eosiolib/eosio.hpp>
-      #include <eosiolib/print.hpp>
+      #include <enumivolib/eosio.hpp>
+      #include <enumivolib/print.hpp>
 
 
       using namespace eosio;
@@ -1658,8 +1658,8 @@ BOOST_FIXTURE_TEST_CASE(abgigen_contract_inheritance, abi_gen_helper)
       #pragma GCC diagnostic push
       #pragma GCC diagnostic ignored "-Wpointer-bool-conversion"
 
-      #include <eosiolib/eosio.hpp>
-      #include <eosiolib/print.hpp>
+      #include <enumivolib/eosio.hpp>
+      #include <enumivolib/print.hpp>
 
 
       using namespace eosio;
diff --git a/unittests/config.hpp.in b/unittests/config.hpp.in
index 1ece71657cc..8feab66c611 100644
--- a/unittests/config.hpp.in
+++ b/unittests/config.hpp.in
@@ -4,7 +4,7 @@
  */
 
 namespace eosio { namespace unittests { namespace config {
-   constexpr char eosiolib_path[] = "${CMAKE_CURRENT_SOURCE_DIR}/../contracts";
+   constexpr char enumivolib_path[] = "${CMAKE_CURRENT_SOURCE_DIR}/../contracts";
    constexpr char pfr_include_path[] = "${CMAKE_CURRENT_SOURCE_DIR}/../externals/magic_get/include";
    constexpr char boost_include_path[] = "${Boost_INCLUDE_DIR}";
 }}}