diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 31694cf81..fc7d60e4c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,13 +34,13 @@ if (WIN32 OR STATIC)
   add_definitions(-DMINIUPNP_STATICLIB)
 endif ()
 
-function (bitmonero_private_headers group)
+function (monero_private_headers group)
   source_group("${group}\\Private"
     FILES
       ${ARGN})
 endfunction ()
 
-function (bitmonero_install_headers subdir)
+function (monero_install_headers subdir)
   install(
     FILES       ${ARGN}
     DESTINATION "include/${subdir}"
@@ -58,7 +58,7 @@ function (enable_stack_trace target)
   endif()
 endfunction()
 
-function (bitmonero_add_executable name)
+function (monero_add_executable name)
   source_group("${name}"
     FILES
       ${ARGN})
@@ -77,7 +77,7 @@ function (bitmonero_add_executable name)
   enable_stack_trace("${name}")
 endfunction ()
 
-function (bitmonero_add_library name)
+function (monero_add_library name)
   source_group("${name}"
     FILES
       ${ARGN})
diff --git a/src/blockchain_db/CMakeLists.txt b/src/blockchain_db/CMakeLists.txt
index 7bca66b8b..cefe93ebe 100644
--- a/src/blockchain_db/CMakeLists.txt
+++ b/src/blockchain_db/CMakeLists.txt
@@ -53,9 +53,9 @@ if (BERKELEY_DB)
   )
 endif()
 
-bitmonero_private_headers(blockchain_db
+monero_private_headers(blockchain_db
   ${crypto_private_headers})
-bitmonero_add_library(blockchain_db
+monero_add_library(blockchain_db
   ${blockchain_db_sources}
   ${blockchain_db_headers}
   ${blockchain_db_private_headers})
diff --git a/src/blockchain_utilities/CMakeLists.txt b/src/blockchain_utilities/CMakeLists.txt
index 13093f6ad..ccfd4a279 100644
--- a/src/blockchain_utilities/CMakeLists.txt
+++ b/src/blockchain_utilities/CMakeLists.txt
@@ -39,7 +39,7 @@ set(blockchain_import_private_headers
   bootstrap_serialization.h
   )
 
-bitmonero_private_headers(blockchain_import
+monero_private_headers(blockchain_import
 	  ${blockchain_import_private_headers})
 
 set(blockchain_export_sources
@@ -54,11 +54,11 @@ set(blockchain_export_private_headers
   bootstrap_serialization.h
   )
 
-bitmonero_private_headers(blockchain_export
+monero_private_headers(blockchain_export
 	  ${blockchain_export_private_headers})
 
 
-bitmonero_add_executable(blockchain_import
+monero_add_executable(blockchain_import
   ${blockchain_import_sources}
   ${blockchain_import_private_headers})
 
@@ -84,7 +84,7 @@ set_property(TARGET blockchain_import
 	PROPERTY
 	OUTPUT_NAME "monero-blockchain-import")
 
-bitmonero_add_executable(blockchain_export
+monero_add_executable(blockchain_export
   ${blockchain_export_sources}
   ${blockchain_export_private_headers})
 
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 744559072..6bf8b1777 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -55,9 +55,9 @@ set(common_private_headers
   i18n.h
   stack_trace.h)
 
-bitmonero_private_headers(common
+monero_private_headers(common
   ${common_private_headers})
-bitmonero_add_library(common
+monero_add_library(common
   ${common_sources}
   ${common_headers}
   ${common_private_headers})
@@ -73,5 +73,5 @@ target_link_libraries(common
   PRIVATE
     ${EXTRA_LIBRARIES})
 
-#bitmonero_install_headers(common
+#monero_install_headers(common
 #  ${common_headers})
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index 28f845d47..9d83caca8 100644
--- a/src/crypto/CMakeLists.txt
+++ b/src/crypto/CMakeLists.txt
@@ -68,9 +68,9 @@ set(crypto_private_headers
   skein.h
   skein_port.h)
 
-bitmonero_private_headers(crypto
+monero_private_headers(crypto
   ${crypto_private_headers})
-bitmonero_add_library(crypto
+monero_add_library(crypto
   ${crypto_sources}
   ${crypto_headers}
   ${crypto_private_headers})
diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt
index 89bf2f682..3b676e8ce 100644
--- a/src/cryptonote_core/CMakeLists.txt
+++ b/src/cryptonote_core/CMakeLists.txt
@@ -66,9 +66,9 @@ else()
   set(Blocks "")
 endif()
 
-bitmonero_private_headers(cryptonote_core
+monero_private_headers(cryptonote_core
   ${crypto_private_headers})
-bitmonero_add_library(cryptonote_core
+monero_add_library(cryptonote_core
   ${cryptonote_core_sources}
   ${cryptonote_core_headers}
   ${cryptonote_core_private_headers})
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 8f9a50f13..0f4baf932 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -74,9 +74,9 @@ set(daemon_private_headers
   ../p2p/p2p_protocol_defs.h
   ../p2p/stdafx.h)
 
-bitmonero_private_headers(daemon
+monero_private_headers(daemon
   ${daemon_private_headers})
-bitmonero_add_executable(daemon
+monero_add_executable(daemon
   ${daemon_sources}
   ${daemon_headers}
   ${daemon_private_headers}
diff --git a/src/daemonizer/CMakeLists.txt b/src/daemonizer/CMakeLists.txt
index eee2c5091..964c8cc6f 100644
--- a/src/daemonizer/CMakeLists.txt
+++ b/src/daemonizer/CMakeLists.txt
@@ -54,9 +54,9 @@ else()
   )
 endif()
 
-bitmonero_private_headers(daemonizer
+monero_private_headers(daemonizer
   ${daemonizer_private_headers})
-bitmonero_add_library(daemonizer
+monero_add_library(daemonizer
   ${daemonizer_sources}
   ${daemonizer_headers}
   ${daemonizer_private_headers})
diff --git a/src/mnemonics/CMakeLists.txt b/src/mnemonics/CMakeLists.txt
index 34670f32d..936c43b99 100644
--- a/src/mnemonics/CMakeLists.txt
+++ b/src/mnemonics/CMakeLists.txt
@@ -44,9 +44,9 @@ set(mnemonics_private_headers
   singleton.h
   spanish.h)
 
-bitmonero_private_headers(mnemonics
+monero_private_headers(mnemonics
   ${mnemonics_private_headers})
-bitmonero_add_library(mnemonics
+monero_add_library(mnemonics
   ${mnemonics_sources}
   ${mnemonics_headers}
   ${mnemonics_private_headers})
diff --git a/src/ringct/CMakeLists.txt b/src/ringct/CMakeLists.txt
index e513c5a09..334a7f350 100644
--- a/src/ringct/CMakeLists.txt
+++ b/src/ringct/CMakeLists.txt
@@ -39,9 +39,9 @@ set(ringct_private_headers
   rctSigs.h
   rctTypes.h)
 
-bitmonero_private_headers(ringct
+monero_private_headers(ringct
   ${crypto_private_headers})
-bitmonero_add_library(ringct
+monero_add_library(ringct
   ${ringct_sources}
   ${ringct_headers}
   ${ringct_private_headers})
diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt
index 1716da75b..050b5e569 100644
--- a/src/rpc/CMakeLists.txt
+++ b/src/rpc/CMakeLists.txt
@@ -36,9 +36,9 @@ set(rpc_private_headers
   core_rpc_server_commands_defs.h
   core_rpc_server_error_codes.h)
 
-bitmonero_private_headers(rpc
+monero_private_headers(rpc
   ${rpc_private_headers})
-bitmonero_add_library(rpc
+monero_add_library(rpc
   ${rpc_sources}
   ${rpc_headers}
   ${rpc_private_headers})
diff --git a/src/simplewallet/CMakeLists.txt b/src/simplewallet/CMakeLists.txt
index 5745781ef..cb9ba2b7c 100644
--- a/src/simplewallet/CMakeLists.txt
+++ b/src/simplewallet/CMakeLists.txt
@@ -36,9 +36,9 @@ set(simplewallet_private_headers
   simplewallet.h
   password_container.h)
 
-bitmonero_private_headers(simplewallet
+monero_private_headers(simplewallet
   ${simplewallet_private_headers})
-bitmonero_add_executable(simplewallet
+monero_add_executable(simplewallet
   ${simplewallet_sources}
   ${simplewallet_headers}
   ${simplewallet_private_headers})
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index 506eaef85..4f82b3c82 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -57,9 +57,9 @@ set(wallet_private_headers
   api/pending_transaction.h
   api/common_defines.h)
 
-bitmonero_private_headers(wallet
+monero_private_headers(wallet
   ${wallet_private_headers})
-bitmonero_add_library(wallet
+monero_add_library(wallet
   ${wallet_sources}
   ${wallet_api_headers}
   ${wallet_private_headers})