Index: boot/generic/src/version.c
===================================================================
--- boot/generic/src/version.c	(revision 77496465c8786f3a56518a8691172796a9aeab24)
+++ boot/generic/src/version.c	(revision 60684765e01daf93191238a3e6a67d0b9d076124)
@@ -32,7 +32,7 @@
 
 static const char *project = "HelenOS bootloader";
-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(KARCH);
 
Index: boot/meson.build
===================================================================
--- boot/meson.build	(revision 77496465c8786f3a56518a8691172796a9aeab24)
+++ boot/meson.build	(revision 60684765e01daf93191238a3e6a67d0b9d076124)
@@ -56,7 +56,7 @@
 		'-D_HELENOS_SOURCE',
 		'-DBOOT',
-		'-DRELEASE=' + HELENOS_RELEASE,
-		'-DCOPYRIGHT=' + HELENOS_COPYRIGHT,
-		'-DNAME=' + HELENOS_NAME,
+		'-DHELENOS_RELEASE=' + HELENOS_RELEASE,
+		'-DHELENOS_COPYRIGHT=' + HELENOS_COPYRIGHT,
+		'-DHELENOS_CODENAME=' + HELENOS_CODENAME,
 		'-D__@0@_BITS__'.format(meson.get_cross_property('bits')),
 	]
Index: kernel/generic/src/main/version.c
===================================================================
--- kernel/generic/src/main/version.c	(revision 77496465c8786f3a56518a8691172796a9aeab24)
+++ kernel/generic/src/main/version.c	(revision 60684765e01daf93191238a3e6a67d0b9d076124)
@@ -38,7 +38,7 @@
 
 static const char *project = "SPARTAN kernel";
-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(KARCH);
 
Index: kernel/meson.build
===================================================================
--- kernel/meson.build	(revision 77496465c8786f3a56518a8691172796a9aeab24)
+++ kernel/meson.build	(revision 60684765e01daf93191238a3e6a67d0b9d076124)
@@ -31,7 +31,7 @@
 	'-D_HELENOS_SOURCE',
 	'-DKERNEL',
-	'-DRELEASE=' + HELENOS_RELEASE,
-	'-DCOPYRIGHT=' + HELENOS_COPYRIGHT,
-	'-DNAME=' + HELENOS_NAME,
+	'-DHELENOS_RELEASE=' + HELENOS_RELEASE,
+	'-DHELENOS_COPYRIGHT=' + HELENOS_COPYRIGHT,
+	'-DHELENOS_CODENAME=' + HELENOS_CODENAME,
 	'-D__@0@_BITS__'.format(meson.get_cross_property('bits')),
 ]
Index: meson/part/read_config/meson.build
===================================================================
--- meson/part/read_config/meson.build	(revision 77496465c8786f3a56518a8691172796a9aeab24)
+++ meson/part/read_config/meson.build	(revision 60684765e01daf93191238a3e6a67d0b9d076124)
@@ -101,9 +101,7 @@
 # Also read version information.
 _version_variables = [
-	'COPYRIGHT',
-	'NAME',
-	'PATCHLEVEL',
-	'SUBLEVEL',
-	'VERSION',
+	'HELENOS_COPYRIGHT',
+	'HELENOS_CODENAME',
+	'HELENOS_RELEASE',
 ]
 
@@ -112,10 +110,7 @@
 	_val = _line.split('=')[1].strip()
 
-	_realvarname = 'HELENOS_' + _varname
-	set_variable(_realvarname, _val)
+	set_variable(_varname, _val)
 	if debug_options
-		message([ _realvarname, get_variable(_realvarname) ])
+		message([ _varname, get_variable(_varname) ])
 	endif
 endforeach
-
-HELENOS_RELEASE = HELENOS_VERSION + '.' + HELENOS_PATCHLEVEL + '.' + HELENOS_SUBLEVEL
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);
 
Index: version
===================================================================
--- version	(revision 77496465c8786f3a56518a8691172796a9aeab24)
+++ version	(revision 60684765e01daf93191238a3e6a67d0b9d076124)
@@ -27,22 +27,6 @@
 #
 
-## This file defines the release information of HelenOS.
-#
-# The release string RELEASE consists of three or four components
-# (version, patch level, sublevel and optionally an extra level).
-#
-# The NAME string is the code name of the given release.
-#
 
-VERSION = 0
-PATCHLEVEL = 9
-SUBLEVEL = 1
-
-ifdef EXTRAVERSION
-	RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)
-else
-	RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
-endif
-
-NAME = Armonia
-COPYRIGHT = Copyright (c) 2001-2019 HelenOS project
+HELENOS_RELEASE = 0.9.1
+HELENOS_CODENAME = Armonia
+HELENOS_COPYRIGHT = Copyright (c) 2001-2019 HelenOS project
