cube: Update cube/vkcube naming

Change-Id: I633c97e9b82a6b5069cc2e7a83106f5d17600c6b
diff --git a/cube/cube.c b/cube/cube.c
index e88fdc2..09723c8 100644
--- a/cube/cube.c
+++ b/cube/cube.c
@@ -60,8 +60,8 @@
 #define BILLION 1000000000L
 
 #define DEMO_TEXTURE_COUNT 1
-#define APP_SHORT_NAME "cube"
-#define APP_LONG_NAME "The Vulkan Cube Demo Program"
+#define APP_SHORT_NAME "vkcube"
+#define APP_LONG_NAME "Vulkan Cube"
 
 // Allow a maximum of two outstanding presentation operations.
 #define FRAME_LAG 2
@@ -99,20 +99,20 @@
 #include <android/log.h>
 #define ERR_EXIT(err_msg, err_class)                                    \
     do {                                                                \
-        ((void)__android_log_print(ANDROID_LOG_INFO, "Cube", err_msg)); \
+        ((void)__android_log_print(ANDROID_LOG_INFO, "Vulkan Cube", err_msg)); \
         exit(1);                                                        \
     } while (0)
 #ifdef VARARGS_WORKS_ON_ANDROID
 void DbgMsg(const char *fmt, ...) {
     va_list va;
     va_start(va, fmt);
-    __android_log_print(ANDROID_LOG_INFO, "Cube", fmt, va);
+    __android_log_print(ANDROID_LOG_INFO, "Vulkan Cube", fmt, va);
     va_end(va);
 }
 #else  // VARARGS_WORKS_ON_ANDROID
 #define DbgMsg(fmt, ...)                                                           \
     do {                                                                           \
-        ((void)__android_log_print(ANDROID_LOG_INFO, "Cube", fmt, ##__VA_ARGS__)); \
+        ((void)__android_log_print(ANDROID_LOG_INFO, "Vulkan Cube", fmt, ##__VA_ARGS__)); \
     } while (0)
 #endif  // VARARGS_WORKS_ON_ANDROID
 #else
@@ -3707,7 +3707,7 @@
         }
 
 #if defined(ANDROID)
-        ERR_EXIT("Usage: cube [--validate]\n", "Usage");
+        ERR_EXIT("Usage: vkcube [--validate]\n", "Usage");
 #else
         fprintf(stderr,
                 "Usage:\n  %s\t[--use_staging] [--validate] [--validate-checks-disabled] [--break]\n"
@@ -3798,7 +3798,7 @@
     }
 
     demo.connection = hInstance;
-    strncpy(demo.name, "cube", APP_NAME_STR_LEN);
+    strncpy(demo.name, "Vulkan Cube", APP_NAME_STR_LEN);
     demo_create_window(&demo);
     demo_init_vk_swapchain(&demo);
 
diff --git a/cube/cube.cpp b/cube/cube.cpp
index bf51eda..5b90fd2 100644
--- a/cube/cube.cpp
+++ b/cube/cube.cpp
@@ -45,7 +45,7 @@
 #define VERIFY(x) ((void)(x))
 #endif
 
-#define APP_SHORT_NAME "cube"
+#define APP_SHORT_NAME "vkcube"
 #ifdef _WIN32
 #define APP_NAME_STR_LEN 80
 #endif
@@ -2934,7 +2934,7 @@
     }
 
     demo.connection = hInstance;
-    strncpy(demo.name, "cube", APP_NAME_STR_LEN);
+    strncpy(demo.name, "Vulkan Cube", APP_NAME_STR_LEN);
     demo.create_window();
     demo.init_vk_swapchain();