diff --git a/src/jrd/os/vms/dfloat_stub.cpp b/src/jrd/os/vms/dfloat_stub.cpp
index 7f62787ce9..9530bd0bc4 100644
--- a/src/jrd/os/vms/dfloat_stub.cpp
+++ b/src/jrd/os/vms/dfloat_stub.cpp
@@ -63,7 +63,7 @@ entry(gds__attach_database)
 	entry(perf_get_info)
 	entry(perf_report)
 	entry(gds__temp_file)
-	entry(isc_vax_integer)
+	entry(gds__vax_integer)
 	entry(gds__encode)
 	entry(gds__decode)
 	entry(gds__interprete)
diff --git a/src/jrd/os/vms/vmsevent.cpp b/src/jrd/os/vms/vmsevent.cpp
index 477badee9f..b154d4025e 100644
--- a/src/jrd/os/vms/vmsevent.cpp
+++ b/src/jrd/os/vms/vmsevent.cpp
@@ -430,7 +430,7 @@ SLONG EVENT_que(ISC_STATUS * status_vector,
 		*ptr = interest;
 		ptr = &interest->rint_req_interests;
 		interest->rint_request = request;
-		interest->rint_count = isc_vax_integer(p, 4);
+		interest->rint_count = gds__vax_integer(p, 4);
 		p += 4;
 		if (interest->rint_count <= event->evnt_count)
 			flag = true;
diff --git a/src/qli/exe.cpp b/src/qli/exe.cpp
index e4b84613bc..a48d32d014 100644
--- a/src/qli/exe.cpp
+++ b/src/qli/exe.cpp
@@ -1104,9 +1104,9 @@ static void print_counts( QLI_REQ request)
 	int length = 0;
 	for (SCHAR* c = count_buffer; *c != isc_info_end; c += length) {
 		UCHAR item = *c++;
-		length = isc_vax_integer(c, 2);
+		length = gds__vax_integer((UCHAR*) c, 2);
 		c += 2;
-		const ULONG number = isc_vax_integer(c, length);
+		const ULONG number = gds__vax_integer((UCHAR*) c, length);
 
 		if (number)
 			switch (item) {
diff --git a/src/qli/meta.epp b/src/qli/meta.epp
index f1cc47a18b..46f169dee7 100644
--- a/src/qli/meta.epp
+++ b/src/qli/meta.epp
@@ -2747,7 +2747,7 @@ static void get_database_type( DBB new_dbb)
 
 	while (*p != isc_info_end && p < buffer + sizeof(buffer)) {
 		UCHAR item = *p++;
-		USHORT l = isc_vax_integer(reinterpret_cast<const SCHAR*>(p), 2);
+		USHORT l = gds__vax_integer(p, 2);
 		p += 2;
 		switch (item) {
 		case isc_info_implementation:
@@ -3355,31 +3355,29 @@ static SYN parse_blr( UCHAR ** ptr, SYM symbol)
 		switch (BLR_BYTE) {
 		case blr_text:
 			dtype = dtype_text;
-			length = l = isc_vax_integer(reinterpret_cast<const SCHAR*>(blr), 2);
+			length = l = gds__vax_integer(blr, 2);
 			blr += 2;
 			break;
 
 		case blr_text2:
 			dtype = dtype_text;
-			scale = isc_vax_integer(reinterpret_cast<const SCHAR*>(blr), 2);
+			scale = gds__vax_integer(blr, 2);
 			blr += 2;
-			length = l = isc_vax_integer(reinterpret_cast<const SCHAR*>(blr), 2);
+			length = l = gds__vax_integer(blr, 2);
 			blr += 2;
 			break;
 
 		case blr_varying:
 			dtype = dtype_varying;
-			length = l = isc_vax_integer(reinterpret_cast<const SCHAR*>(blr), 2) 
-						+ sizeof(USHORT);
+			length = l = gds__vax_integer(blr, 2) + sizeof(USHORT);
 			blr += 2;
 			break;
 
 		case blr_varying2:
 			dtype = dtype_varying;
-			scale = isc_vax_integer(reinterpret_cast<const SCHAR*>(blr), 2);
+			scale = gds__vax_integer(blr, 2);
 			blr += 2;
-			length = l = isc_vax_integer(reinterpret_cast<const SCHAR*>(blr), 2) 
-							+ sizeof(USHORT);
+			length = l = gds__vax_integer(blr, 2) + sizeof(USHORT);
 			blr += 2;
 			break;
 
@@ -3438,11 +3436,11 @@ static SYN parse_blr( UCHAR ** ptr, SYM symbol)
 			while (l--)
 				*p++ = BLR_BYTE;
 		else if (dtype == dtype_short) {
-			*(SSHORT *) p = isc_vax_integer(reinterpret_cast<const SCHAR*>(blr), l);
+			*(SSHORT *) p = gds__vax_integer(blr, l);
 			blr += l;
 		}
 		else if (dtype == dtype_long) {
-			*(SLONG *) p = isc_vax_integer(reinterpret_cast<const SCHAR*>(blr), l);
+			*(SLONG *) p = gds__vax_integer(blr, l);
 			blr += l;
 		}
 		node = make_node(nod_constant, 1);
@@ -3854,11 +3852,11 @@ static void wal_info(
 	UCHAR item;
 	UCHAR* d;
 	while ((item = *p++) != isc_info_end) {
-		SLONG length = isc_vax_integer(reinterpret_cast<const SCHAR*>(p), 2);
+		SLONG length = gds__vax_integer(p, 2);
 		p += 2;
 		switch (item) {
 		case isc_info_logfile:
-			*log = isc_vax_integer(reinterpret_cast<const SCHAR*>(p), length);
+			*log = gds__vax_integer(p, length);
 			p += length;
 			break;
 
@@ -3871,7 +3869,7 @@ static void wal_info(
 			break;
 
 		case isc_info_cur_log_part_offset:
-			*part_offset = isc_vax_integer(reinterpret_cast<const SCHAR*>(p), length);
+			*part_offset = gds__vax_integer(p, length);
 			p += length;
 			break;
 
diff --git a/src/qli/show.epp b/src/qli/show.epp
index dfe2317ebc..a945788834 100644
--- a/src/qli/show.epp
+++ b/src/qli/show.epp
@@ -820,15 +820,15 @@ static void show_dbb_parameters( DBB database)
 
 	for (UCHAR *d = buffer; *d != isc_info_end;) {
 		UCHAR item = *d++;
-		int length = isc_vax_integer(reinterpret_cast<const SCHAR*>(d), 2);
+		int length = gds__vax_integer(d, 2);
 		d += 2;
 		switch (item) {
 		case (isc_info_db_size_in_pages):
-			allocation = isc_vax_integer(reinterpret_cast<const SCHAR*>(d), length);
+			allocation = gds__vax_integer(d, length);
 			break;
 
 		case (isc_info_page_size):
-			page_size = isc_vax_integer(reinterpret_cast<const SCHAR*>(d), length);
+			page_size = gds__vax_integer(d, length);
 			break;
 
 		case (isc_info_error):
diff --git a/src/remote/merge.cpp b/src/remote/merge.cpp
index 97f1bc17ef..d1f8085b2c 100644
--- a/src/remote/merge.cpp
+++ b/src/remote/merge.cpp
@@ -105,7 +105,7 @@ USHORT MERGE_database_info(const UCHAR* in,
 			break;
 
 		default:
-			length = (SSHORT) isc_vax_integer(reinterpret_cast<const SCHAR*>(in), 2);
+			length = (SSHORT) gds__vax_integer(in, 2);
 			in += 2;
 			if (out + length + 2 >= end) {
 				out[-1] = isc_info_truncated;
@@ -177,7 +177,7 @@ static ISC_STATUS merge_setup(
  *	already there.
  *
  **************************************/
-	USHORT length = (USHORT) isc_vax_integer(reinterpret_cast<const SCHAR*>(*in), 2);
+	USHORT length = (USHORT) gds__vax_integer(*in, 2);
 	const USHORT new_length = length + delta_length;
 
 	if (*out + new_length + 2 >= end) {
diff --git a/src/remote/remote.cpp b/src/remote/remote.cpp
index c51dcf1ca9..63f98b833e 100644
--- a/src/remote/remote.cpp
+++ b/src/remote/remote.cpp
@@ -787,7 +787,7 @@ static SLONG get_parameter(const UCHAR** ptr)
  *
  **************************************/
 	const SSHORT l = *(*ptr)++;
-	const SLONG parameter = isc_vax_integer(reinterpret_cast<const SCHAR*>(*ptr), l);
+	const SLONG parameter = gds__vax_integer(*ptr, l);
 	*ptr += l;
 
 	return parameter;
diff --git a/src/remote/server.cpp b/src/remote/server.cpp
index 504095c4b9..daddf350f7 100644
--- a/src/remote/server.cpp
+++ b/src/remote/server.cpp
@@ -1038,8 +1038,8 @@ static USHORT check_statement_type( RSR statement)
 	{
 		for (info = buffer; (*info != isc_info_end) && !done;)
 		{
-			l = (USHORT) isc_vax_integer(reinterpret_cast<const SCHAR*>(info + 1), 2);
-			type = (USHORT) isc_vax_integer(reinterpret_cast<const SCHAR*>(info + 3), l);
+			l = (USHORT) gds__vax_integer(info + 1, 2);
+			type = (USHORT) gds__vax_integer(info + 3, l);
 			switch (*info)
 			{
 			case isc_info_sql_stmt_type:
@@ -2251,8 +2251,8 @@ static bool get_next_msg_no(RRQ request,
 
 	bool result = false;
 	for (info = info_buffer; *info != isc_info_end;) {
-		l = (USHORT) isc_vax_integer(reinterpret_cast<const SCHAR*>(info + 1), 2);
-		n = (USHORT) isc_vax_integer(reinterpret_cast<const SCHAR*>(info + 3), l);
+		l = (USHORT) gds__vax_integer(info + 1, 2);
+		n = (USHORT) gds__vax_integer(info + 3, l);
 		switch (*info) {
 		case isc_info_state:
 			if (n != isc_info_req_send)
diff --git a/src/utilities/run_service.cpp b/src/utilities/run_service.cpp
index 1a8aa0ce4f..24bb85983f 100644
--- a/src/utilities/run_service.cpp
+++ b/src/utilities/run_service.cpp
@@ -101,7 +101,7 @@ int CLIB_ROUTINE main( int argc, char *argv[])
 		while (p < buffer + sizeof(buffer) &&
 			   (item = *p) != isc_info_end &&
 			   item != isc_info_truncated && item != isc_info_svc_timeout) {
-			len = isc_vax_integer(p + 1, 2);
+			len = gds__vax_integer(p + 1, 2);
 			p += 2;
 			while (len--) {
 				p++;
diff --git a/src/utilities/stats.epp b/src/utilities/stats.epp
index e6203d9427..bbad0a89f8 100644
--- a/src/utilities/stats.epp
+++ b/src/utilities/stats.epp
@@ -28,7 +28,7 @@
 DATABASE DB = "yachts.lnk";
 
 extern SCHAR *gds__alloc();
-extern SLONG isc_vax_integer();
+extern SLONG gds__vax_integer();
 
 #define ITEM_seq_reads	0
 #define ITEM_idx_reads	1
@@ -153,7 +153,7 @@ int stats_fetch(SLONG *status_vector, int **db_handle, STATS *stats_ptr)
 
 	for (p = info_buffer;
 		 p < info_buffer + sizeof(info_buffer) && *p != isc_info_end;) {
-		length = isc_vax_integer(p + 1, 2);
+		length = gds__vax_integer(p + 1, 2);
 		item = -1;
 		switch (*p) {
 		case isc_info_read_seq_count:
@@ -282,7 +282,7 @@ static int get_counts(ISC_STATUS *status_vector, SCHAR *info, SSHORT length,
 	stats = *stats_ptr;
 
 	for (p = info, end = p + length; p < end; p += 6) {
-		relation_id = isc_vax_integer(p, 2);
+		relation_id = gds__vax_integer(p, 2);
 		if (relation_id >= stats->stats_count)
 			if (!expand_stats(&stats, relation_id)) {
 				status_vector[0] = isc_arg_gds;
@@ -291,7 +291,7 @@ static int get_counts(ISC_STATUS *status_vector, SCHAR *info, SSHORT length,
 				return status_vector[1];
 			}
 		stats->stats_counts[relation_id * ITEM_count + item] =
-			isc_vax_integer(p + 2, 4);
+			gds__vax_integer(p + 2, 4);
 	}
 	return status_vector[1];
 }