Rename cube and cubepp exes to vkcube and vkcubepp

Change-Id: Iaecb0e7e21a086c8523b8cd4bc9eccd05e1cbca0

13 files changed, 64 insertions, 64 deletions

diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt
index 67dff63f..0386204d 100644
--- a/cube/CMakeLists.txt
+++ b/cube/CMakeLists.txt
@@ -46,7 +46,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
     option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
-    set(CUBE_WSI_SELECTION "XCB" CACHE STRING "Select WSI target for cube (XCB, XLIB, WAYLAND, DISPLAY)")
+    set(CUBE_WSI_SELECTION "XCB" CACHE STRING "Select WSI target for vkcube (XCB, XLIB, WAYLAND, DISPLAY)")
 
     if(BUILD_WSI_XCB_SUPPORT)
         find_package(XCB REQUIRED)
@@ -66,7 +66,7 @@ if(WIN32)
     add_definitions(-DVK_USE_PLATFORM_WIN32_KHR -DWIN32_LEAN_AND_MEAN)
     if(NOT MSVC_VERSION LESS 1900)
         # Enable control flow guard
-        message(STATUS "Building cube with control flow guard")
+        message(STATUS "Building vkcube with control flow guard")
         add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/guard:cf>")
         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf")
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
@@ -82,21 +82,21 @@ elseif(UNIX AND NOT APPLE) # i.e. Linux
 
     if(CUBE_WSI_SELECTION STREQUAL "XCB")
         if(NOT BUILD_WSI_XCB_SUPPORT)
-            message(FATAL_ERROR "Selected XCB for cube build but not building Xcb support")
+            message(FATAL_ERROR "Selected XCB for vkcube build but not building Xcb support")
         endif()
         set(CUBE_INCLUDE_DIRS ${XCB_INCLUDE_DIRS} ${CUBE_INCLUDE_DIRS})
         link_libraries(${XCB_LIBRARIES})
         add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
     elseif(CUBE_WSI_SELECTION STREQUAL "XLIB")
         if(NOT BUILD_WSI_XLIB_SUPPORT)
-            message(FATAL_ERROR "Selected XLIB for cube build but not building Xlib support")
+            message(FATAL_ERROR "Selected XLIB for vkcube build but not building Xlib support")
         endif()
         set(CUBE_INCLUDE_DIRS ${X11_INCLUDE_DIR} ${CUBE_INCLUDE_DIRS})
         link_libraries(${X11_LIBRARIES})
         add_definitions(-DVK_USE_PLATFORM_XLIB_KHR)
     elseif(CUBE_WSI_SELECTION STREQUAL "WAYLAND")
         if(NOT BUILD_WSI_WAYLAND_SUPPORT)
-            message(FATAL_ERROR "Selected Wayland for cube build but not building Wayland support")
+            message(FATAL_ERROR "Selected Wayland for vkcube build but not building Wayland support")
         endif()
         set(CUBE_INCLUDE_DIRS ${WAYLAND_CLIENT_INCLUDE_DIR} ${CUBE_INCLUDE_DIRS})
         link_libraries(${WAYLAND_CLIENT_LIBRARIES})
@@ -161,19 +161,19 @@ endif()
 include_directories(${CUBE_INCLUDE_DIRS})
 
 # ----------------------------------------------------------------------------
-# cube
+# vkcube
 
 if(APPLE)
     include(macOS/cube/cube.cmake)
 elseif(NOT WIN32)
     if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
-        add_executable(cube
+        add_executable(vkcube
                        cube.c
                        ${PROJECT_SOURCE_DIR}/cube/cube.vert
                        ${PROJECT_SOURCE_DIR}/cube/cube.frag
                        cube.vert.inc
                        cube.frag.inc)
-        target_link_libraries(cube Vulkan::Vulkan)
+        target_link_libraries(vkcube Vulkan::Vulkan)
     endif()
 else()
     if(CMAKE_CL_64)
@@ -182,43 +182,43 @@ else()
         set(LIB_DIR "Win32")
     endif()
 
-    add_executable(cube
+    add_executable(vkcube
                    WIN32
                    cube.c
                    ${PROJECT_SOURCE_DIR}/cube/cube.vert
                    ${PROJECT_SOURCE_DIR}/cube/cube.frag
                    cube.vert.inc
                    cube.frag.inc)
-    target_link_libraries(cube Vulkan::Vulkan)
+    target_link_libraries(vkcube Vulkan::Vulkan)
 endif()
 
 if(APPLE)
     # Keep RPATH so fixup_bundle can use it to find libraries
-    set_target_properties(cube PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
-    install(TARGETS cube BUNDLE DESTINATION "cube")
+    set_target_properties(vkcube PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
+    install(TARGETS vkcube BUNDLE DESTINATION "cube")
     # Fix up the library references to be self-contained within the bundle.
     install(CODE "
         include(BundleUtilities)
         fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/cube.app \"\" \"${Vulkan_LIBRARY_DIR}\")
         ")
 else()
-    install(TARGETS cube RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+    install(TARGETS vkcube RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 # ----------------------------------------------------------------------------
-# cubepp
+# vkcubepp
 
 if(APPLE)
     include(macOS/cubepp/cubepp.cmake)
 elseif(NOT WIN32)
     if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
-        add_executable(cubepp
+        add_executable(vkcubepp
                        cube.cpp
                        ${PROJECT_SOURCE_DIR}/cube/cube.vert
                        ${PROJECT_SOURCE_DIR}/cube/cube.frag
                        cube.vert.inc
                        cube.frag.inc)
-        target_link_libraries(cubepp Vulkan::Vulkan)
+        target_link_libraries(vkcubepp Vulkan::Vulkan)
     endif()
 else()
     if(CMAKE_CL_64)
@@ -227,25 +227,25 @@ else()
         set(LIB_DIR "Win32")
     endif()
 
-    add_executable(cubepp
+    add_executable(vkcubepp
                    WIN32
                    cube.cpp
                    ${PROJECT_SOURCE_DIR}/cube/cube.vert
                    ${PROJECT_SOURCE_DIR}/cube/cube.frag
                    cube.vert.inc
                    cube.frag.inc)
-    target_link_libraries(cubepp Vulkan::Vulkan)
+    target_link_libraries(vkcubepp Vulkan::Vulkan)
 endif()
 
 if(APPLE)
     # Keep RPATH so fixup_bundle can use it to find libraries
-    set_target_properties(cubepp PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
-    install(TARGETS cubepp BUNDLE DESTINATION "cube")
+    set_target_properties(vkcubepp PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
+    install(TARGETS vkcubepp BUNDLE DESTINATION "cube")
     # Fix up the library references to be self-contained within the bundle.
     install(CODE "
         include(BundleUtilities)
         fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/cubepp.app \"\" \"${Vulkan_LIBRARY_DIR}\")
         ")
 else()
-    install(TARGETS cubepp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+    install(TARGETS vkcubepp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
diff --git a/cube/android/cube-with-layers/AndroidManifest.xml b/cube/android/cube-with-layers/AndroidManifest.xml
index 29c8d1a0..50b216e4 100644
--- a/cube/android/cube-with-layers/AndroidManifest.xml
+++ b/cube/android/cube-with-layers/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.CubeWithLayers" android:versionCode="1" android:versionName="1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.VkCubeWithLayers" android:versionCode="1" android:versionName="1.0">
 
     <!-- Allow this app to read and write files (for use by tracing libraries). -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -16,7 +16,7 @@
              This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity" android:label="@string/app_name" android:exported="true">
             <!-- Tell NativeActivity the name of or .so -->
-            <meta-data android:name="android.app.lib_name" android:value="Cube"/>
+            <meta-data android:name="android.app.lib_name" android:value="VkCube"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/cube/android/cube-with-layers/custom_rules.xml b/cube/android/cube-with-layers/custom_rules.xml
index ab517bfe..0ca5933e 100644
--- a/cube/android/cube-with-layers/custom_rules.xml
+++ b/cube/android/cube-with-layers/custom_rules.xml
@@ -5,21 +5,21 @@
 <property name="cubeDir" location="../libs" />
 <property name="layersDir" location="../../../build-android/libs" />
 
-<echo>CubeWithLayers: Creating libs-with-layers</echo>
+<echo>VkCubeWithLayers: Creating libs-with-layers</echo>
 <mkdir dir="${cubeWithLayersDir}"/>
 
-<echo>CubeWithLayers: Copying libs from demos/android</echo>
+<echo>VkCubeWithLayers: Copying libs from demos/android</echo>
 <copy todir="${cubeWithLayersDir}">
 <fileset dir="${cubeDir}"/>
 </copy>
 
-<echo>CubeWithLayers: Copying layers from build-android</echo>
+<echo>VkCubeWithLayers: Copying layers from build-android</echo>
 <copy todir="${cubeWithLayersDir}">
 <fileset dir="${layersDir}"/>
 </copy>
 
 <!-- Point ndk-build at the libs-with-layers common dir -->
-<echo>CubeWithLayers: Overriding native.libs.absolute.dir with ${cubeWithLayersDir}</echo>
+<echo>VkCubeWithLayers: Overriding native.libs.absolute.dir with ${cubeWithLayersDir}</echo>
 <property name="native.libs.absolute.dir" location="${cubeWithLayersDir}" />
 
 </project>
diff --git a/cube/android/cube-with-layers/res/values/strings.xml b/cube/android/cube-with-layers/res/values/strings.xml
index bdf81e5b..ecd779e4 100644
--- a/cube/android/cube-with-layers/res/values/strings.xml
+++ b/cube/android/cube-with-layers/res/values/strings.xml
@@ -19,6 +19,6 @@
 
 <resources>
     <!-- Simple strings. -->
-    <string name="app_name">CubeWithLayers</string>
+    <string name="app_name">VkCubeWithLayers</string>
 
 </resources>
diff --git a/cube/android/cube/AndroidManifest.xml b/cube/android/cube/AndroidManifest.xml
index 6ac0c8a3..1bf9080b 100644
--- a/cube/android/cube/AndroidManifest.xml
+++ b/cube/android/cube/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.Cube" android:versionCode="1" android:versionName="1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.VkCube" android:versionCode="1" android:versionName="1.0">
 
     <!-- Allow this app to read and write files (for use by tracing libraries). -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -16,7 +16,7 @@
              This will take care of integrating with our NDK code. -->
         <activity android:name="android.app.NativeActivity" android:label="@string/app_name" android:exported="true">
             <!-- Tell NativeActivity the name of or .so -->
-            <meta-data android:name="android.app.lib_name" android:value="Cube"/>
+            <meta-data android:name="android.app.lib_name" android:value="VkCube"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/cube/android/cube/custom_rules.xml b/cube/android/cube/custom_rules.xml
index 335c1c34..31eb31ad 100644
--- a/cube/android/cube/custom_rules.xml
+++ b/cube/android/cube/custom_rules.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="NativeActivity" default="help">
 <!-- Point ndk-build at the libs created in common dir -->
-<echo>cube: Overriding native.libs.absolute.dir with ../libs</echo>
+<echo>vkcube: Overriding native.libs.absolute.dir with ../libs</echo>
 <property name="native.libs.absolute.dir" location="../libs" />
 </project>
diff --git a/cube/android/cube/res/values/strings.xml b/cube/android/cube/res/values/strings.xml
index 7f175a60..8adead25 100644
--- a/cube/android/cube/res/values/strings.xml
+++ b/cube/android/cube/res/values/strings.xml
@@ -19,6 +19,6 @@
 
 <resources>
     <!-- Simple strings. -->
-    <string name="app_name">Cube</string>
+    <string name="app_name">VkCube</string>
 
 </resources>
diff --git a/cube/android/jni/Android.mk b/cube/android/jni/Android.mk
index 25828cf9..cc4b93ce 100644
--- a/cube/android/jni/Android.mk
+++ b/cube/android/jni/Android.mk
@@ -18,7 +18,7 @@ SRC_DIR := $(LOCAL_PATH)/../../..
 DEMO_DIR := $(SRC_DIR)/cube
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := Cube
+LOCAL_MODULE := VkCube
 LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c \
                    $(SRC_DIR)/common/vulkan_wrapper.cpp \
                    $(SRC_DIR)/common/android_util.cpp
diff --git a/cube/android/jni/Application.mk b/cube/android/jni/Application.mk
index e215f210..cd664539 100644
--- a/cube/android/jni/Application.mk
+++ b/cube/android/jni/Application.mk
@@ -16,7 +16,7 @@
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
 APP_PLATFORM := android-23
 APP_STL := gnustl_static
-APP_MODULES := Cube
+APP_MODULES := VkCube
 APP_CPPFLAGS += -std=c++11 -fexceptions -Wall -Werror -Wextra -Wno-unused-parameter -DVK_NO_PROTOTYES -DGLM_FORCE_RADIANS
 APP_CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -DVK_NO_PROTOTYES -DGLM_FORCE_RADIANS
 NDK_TOOLCHAIN_VERSION := clang
diff --git a/cube/macOS/cube/Info.plist b/cube/macOS/cube/Info.plist
index b7869d6e..5bad4454 100644
--- a/cube/macOS/cube/Info.plist
+++ b/cube/macOS/cube/Info.plist
@@ -7,17 +7,17 @@
 	<key>CFBundleExecutable</key>
 	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Cube</string>
+	<string>VkCube</string>
 	<key>CFBundleIconFile</key>
 	<string>LunarGIcon.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.lunarg.cube</string>
+	<string>com.lunarg.vkcube</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleName</key>
-	<string>Cube</string>
+	<string>VkCube</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake
index b2b6ba53..5b1e228e 100644
--- a/cube/macOS/cube/cube.cmake
+++ b/cube/macOS/cube/cube.cmake
@@ -15,7 +15,7 @@
 # limitations under the License.
 # ~~~
 
-# Cube Application Bundle
+# VkCube Application Bundle
 
 set(cube_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/main.m
@@ -32,32 +32,32 @@ if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
     set(cube_RESOURCES ${cube_RESOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Resources/Main.storyboard)
 endif()
 
-add_executable(cube MACOSX_BUNDLE ${cube_SRCS} ${cube_HDRS} ${cube_RESOURCES} cube.vert.inc cube.frag.inc)
+add_executable(vkcube MACOSX_BUNDLE ${cube_SRCS} ${cube_HDRS} ${cube_RESOURCES} cube.vert.inc cube.frag.inc)
 
 # Handle the Storyboard ourselves
 if(NOT ${CMAKE_GENERATOR} MATCHES "^Xcode.*")
     # Compile the storyboard file with the ibtool.
-    add_custom_command(TARGET cube POST_BUILD
+    add_custom_command(TARGET vkcube POST_BUILD
                        COMMAND ${IBTOOL}
                                --errors
                                --warnings
                                --notices
                                --output-format human-readable-text
-                               --compile ${CMAKE_CURRENT_BINARY_DIR}/cube.app/Contents/Resources/Main.storyboardc
+                               --compile ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Resources/Main.storyboardc
                                          ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Resources/Main.storyboard
                        COMMENT "Compiling storyboard")
 endif()
 
-add_dependencies(cube MoltenVK_icd-staging-json)
+add_dependencies(vkcube MoltenVK_icd-staging-json)
 
 # Include demo source code dir because the MacOS cube's Objective-C source includes the "original" cube application C source code.
 # Also include the MoltenVK helper files.
-target_include_directories(cube PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include)
+target_include_directories(vkcube PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include)
 
 # We do this so vulkaninfo is linked to an individual library and NOT a framework.
-target_link_libraries(cube ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore")
+target_link_libraries(vkcube ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore")
 
-set_target_properties(cube PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Info.plist)
+set_target_properties(vkcube PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Info.plist)
 
 # The RESOURCE target property cannot be used in conjunction with the MACOSX_PACKAGE_LOCATION property.  We need fine-grained
 # control over the Resource directory, so we have to specify the destination of all the resource files on a per-destination-
@@ -71,13 +71,13 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json"
 
 # Copy the MoltenVK lib into the bundle.
 if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
-    add_custom_command(TARGET cube POST_BUILD
+    add_custom_command(TARGET vkcube POST_BUILD
                        COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/libMoltenVK.dylib"
-                               ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/cube.app/Contents/Frameworks/libMoltenVK.dylib
+                               ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcube.app/Contents/Frameworks/libMoltenVK.dylib
                        DEPENDS vulkan)
 else()
-    add_custom_command(TARGET cube POST_BUILD
+    add_custom_command(TARGET vkcube POST_BUILD
                        COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/libMoltenVK.dylib"
-                               ${CMAKE_CURRENT_BINARY_DIR}/cube.app/Contents/Frameworks/libMoltenVK.dylib
+                               ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks/libMoltenVK.dylib
                        DEPENDS vulkan)
 endif()
diff --git a/cube/macOS/cubepp/Info.plist b/cube/macOS/cubepp/Info.plist
index e8a276ce..0f1c5452 100644
--- a/cube/macOS/cubepp/Info.plist
+++ b/cube/macOS/cubepp/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Cubepp</string>
+	<string>VkCubepp</string>
 	<key>CFBundleIconFile</key>
 	<string>LunarGIcon.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -17,7 +17,7 @@
 	<key>CFBundleLongVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleName</key>
-	<string>Cubepp</string>
+	<string>VkCubepp</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake
index 2b523a98..3d95d802 100644
--- a/cube/macOS/cubepp/cubepp.cmake
+++ b/cube/macOS/cubepp/cubepp.cmake
@@ -15,7 +15,7 @@
 # limitations under the License.
 # ~~~
 
-# Cube Application Bundle
+# VkCube Application Bundle
 
 set(cubepp_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/main.mm
@@ -34,32 +34,32 @@ if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
     set(cubepp_RESOURCES ${cubepp_RESOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Resources/Main.storyboard)
 endif()
 
-add_executable(cubepp MACOSX_BUNDLE ${cubepp_SRCS} ${cubepp_HDRS} ${cubepp_RESOURCES} cube.vert.inc cube.frag.inc)
+add_executable(vkcubepp MACOSX_BUNDLE ${cubepp_SRCS} ${cubepp_HDRS} ${cubepp_RESOURCES} cube.vert.inc cube.frag.inc)
 
 # Handle the Storyboard ourselves
 if(NOT ${CMAKE_GENERATOR} MATCHES "^Xcode.*")
     # Compile the storyboard file with the ibtool.
-    add_custom_command(TARGET cubepp POST_BUILD
+    add_custom_command(TARGET vkcubepp POST_BUILD
                        COMMAND ${IBTOOL}
                                --errors
                                --warnings
                                --notices
                                --output-format human-readable-text
-                               --compile ${CMAKE_CURRENT_BINARY_DIR}/cubepp.app/Contents/Resources/Main.storyboardc
+                               --compile ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Resources/Main.storyboardc
                                          ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Resources/Main.storyboard
                        COMMENT "Compiling storyboard")
 endif()
 
-add_dependencies(cubepp MoltenVK_icd-staging-json)
+add_dependencies(vkcubepp MoltenVK_icd-staging-json)
 
-# Include demo source code dir because the MacOS cubepp's Objective-C source includes the "original" cubepp application C++ source
+# Include demo source code dir because the MacOS vkcubepp's Objective-C source includes the "original" vkcubepp application C++ source
 # code. Also include the MoltenVK helper files.
-target_include_directories(cubepp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include)
+target_include_directories(vkcubepp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include)
 
 # We do this so vulkaninfo is linked to an individual library and NOT a framework.
-target_link_libraries(cubepp ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore")
+target_link_libraries(vkcubepp ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore")
 
-set_target_properties(cubepp PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Info.plist)
+set_target_properties(vkcubepp PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Info.plist)
 
 # The RESOURCE target property cannot be used in conjunction with the MACOSX_PACKAGE_LOCATION property.  We need fine-grained
 # control over the Resource directory, so we have to specify the destination of all the resource files on a per-destination-
@@ -73,13 +73,13 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json"
 
 # Copy the MoltenVK lib into the bundle.
 if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
-    add_custom_command(TARGET cubepp POST_BUILD
+    add_custom_command(TARGET vkcubepp POST_BUILD
                        COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/libMoltenVK.dylib"
-                               ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/cubepp.app/Contents/Frameworks/libMoltenVK.dylib
+                               ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib
                        DEPENDS vulkan)
 else()
-    add_custom_command(TARGET cubepp POST_BUILD
+    add_custom_command(TARGET vkcubepp POST_BUILD
                        COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/libMoltenVK.dylib"
-                               ${CMAKE_CURRENT_BINARY_DIR}/cubepp.app/Contents/Frameworks/libMoltenVK.dylib
+                               ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib
                        DEPENDS vulkan)
 endif()