diff --git a/criu/cr-service.c b/criu/cr-service.c
index 368197703..1f1e5fa86 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -969,8 +969,8 @@ static int handle_version(int sk, CriuReq * msg)
 	CriuVersion version = CRIU_VERSION__INIT;
 
 	/* This assumes we will always have a major and minor version */
-	version.major = CRIU_VERSION_MAJOR;
-	version.minor = CRIU_VERSION_MINOR;
+	version.major_number = CRIU_VERSION_MAJOR;
+	version.minor_number = CRIU_VERSION_MINOR;
 	if (strcmp(CRIU_GITID, "0")) {
 		version.gitid = CRIU_GITID;
 	}
diff --git a/images/rpc.proto b/images/rpc.proto
index af0e99e30..e67471706 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -211,8 +211,8 @@ message criu_resp {
 
 /* Answer for criu_req_type.VERSION requests */
 message criu_version {
-	required int32			major		= 1;
-	required int32			minor		= 2;
+	required int32			major_number	= 1;
+	required int32			minor_number	= 2;
 	optional string			gitid		= 3;
 	optional int32			sublevel	= 4;
 	optional int32			extra		= 5;
diff --git a/test/others/rpc/test.py b/test/others/rpc/test.py
index fe67103ba..0addbaedc 100755
--- a/test/others/rpc/test.py
+++ b/test/others/rpc/test.py
@@ -66,8 +66,8 @@ if resp.type != rpc.VERSION:
 else:
 	if resp.success:
 		print('RPC: Success')
-		print('CRIU major %d' % resp.version.major)
-		print('CRIU minor %d' % resp.version.minor)
+		print('CRIU major %d' % resp.version.major_number)
+		print('CRIU minor %d' % resp.version.minor_number)
 		if resp.version.HasField('gitid'):
 			print('CRIU gitid %s' % resp.version.gitid)
 		if resp.version.HasField('sublevel'):
diff --git a/test/others/rpc/version.py b/test/others/rpc/version.py
index 5cca4e249..247bc466d 100755
--- a/test/others/rpc/version.py
+++ b/test/others/rpc/version.py
@@ -32,8 +32,8 @@ if resp.type != rpc.VERSION:
 else:
 	if resp.success:
 		print('RPC: Success')
-		print('CRIU major %d' % resp.version.major)
-		print('CRIU minor %d' % resp.version.minor)
+		print('CRIU major %d' % resp.version.major_number)
+		print('CRIU minor %d' % resp.version.minor_number)
 		if resp.version.HasField('gitid'):
 			print('CRIU gitid %s' % resp.version.gitid)
 		if resp.version.HasField('sublevel'):