Index: uspace/app/download/main.c
===================================================================
--- uspace/app/download/main.c	(revision 77496465c8786f3a56518a8691172796a9aeab24)
+++ uspace/app/download/main.c	(revision 60684765e01daf93191238a3e6a67d0b9d076124)
@@ -49,7 +49,7 @@
 #define NAME "download"
 #ifdef TIMESTAMP_UNIX
-#define VERSION STRING(RELEASE) "-" STRING(TIMESTAMP_UNIX)
+#define VERSION STRING(HELENOS_RELEASE) "-" STRING(TIMESTAMP_UNIX)
 #else
-#define VERSION STRING(RELEASE)
+#define VERSION STRING(HELENOS_RELEASE)
 #endif
 #define USER_AGENT "HelenOS-" NAME "/" VERSION
Index: uspace/app/getterm/meson.build
===================================================================
--- uspace/app/getterm/meson.build	(revision 77496465c8786f3a56518a8691172796a9aeab24)
+++ uspace/app/getterm/meson.build	(revision 60684765e01daf93191238a3e6a67d0b9d076124)
@@ -1,3 +1,3 @@
-c_args += [ '-DRELEASE=' + HELENOS_RELEASE, '-DCOPYRIGHT=' + HELENOS_COPYRIGHT, '-DNAME=' + HELENOS_NAME ]
+c_args += [ '-DHELENOS_RELEASE=' + HELENOS_RELEASE, '-DHELENOS_COPYRIGHT=' + HELENOS_COPYRIGHT, '-DHELENOS_CODENAME=' + HELENOS_CODENAME ]
 src = files(
 	'getterm.c',
Index: uspace/app/getterm/version.c
===================================================================
--- uspace/app/getterm/version.c	(revision 77496465c8786f3a56518a8691172796a9aeab24)
+++ uspace/app/getterm/version.c	(revision 60684765e01daf93191238a3e6a67d0b9d076124)
@@ -39,7 +39,7 @@
 #include "version.h"
 
-static const char *copyright = STRING(COPYRIGHT);
-static const char *release = STRING(RELEASE);
-static const char *name = STRING(NAME);
+static const char *copyright = STRING(HELENOS_COPYRIGHT);
+static const char *release = STRING(HELENOS_RELEASE);
+static const char *name = STRING(HELENOS_CODENAME);
 static const char *arch = STRING(UARCH);