diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85a14bd7f..169511864 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
 if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
      include ( ${OEM_THEME_DIR}/OEM.cmake )
 else ()
-     include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
+     include ( ${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake )
 endif()
 # need this logic to not mess with re/uninstallations via macosx.pkgproj
 if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient")
diff --git a/CPackOptions.cmake.in b/CPackOptions.cmake.in
index 0fcfc4593..535421ad4 100644
--- a/CPackOptions.cmake.in
+++ b/CPackOptions.cmake.in
@@ -14,7 +14,7 @@ set( OEM_THEME_DIR     @OEM_THEME_DIR@ )
 if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
      include ( ${OEM_THEME_DIR}/OEM.cmake )
 else ()
-     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
+     include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" )
 endif()
 
 set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
diff --git a/OWNCLOUD.cmake b/NEXTCLOUD.cmake
similarity index 100%
rename from OWNCLOUD.cmake
rename to NEXTCLOUD.cmake
diff --git a/OwnCloudCPack.cmake b/OwnCloudCPack.cmake
index 39eee0080..0a506b945 100644
--- a/OwnCloudCPack.cmake
+++ b/OwnCloudCPack.cmake
@@ -5,7 +5,7 @@ set( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
      include ( "${OEM_THEME_DIR}/OEM.cmake" )
 else ()
-     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
+     include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" )
 endif()
 
 include( VERSION.cmake )
diff --git a/admin/osx/CMakeLists.txt b/admin/osx/CMakeLists.txt
index 78f9ec32a..7976fafa1 100644
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
-# from the OEM.cmake for branded clients or from OWNCLOUD.cmake for the non
+# from the OEM.cmake for branded clients or from NEXTCLOUD.cmake for the non
 # branded client.
 # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
 # includes CMAKE_SOURCE_DIR or so.