diff --git a/obj/Makefile.in b/obj/Makefile.in
index bb3ae6e7fc41974010bfc6606f429e7156240974..fec1ed969356bc4274fb09105980325bf01f5551 100644
--- a/obj/Makefile.in
+++ b/obj/Makefile.in
@@ -82,7 +82,7 @@ include ../src/Makefile.incl
 LIB=${XERCESCROOT}/lib
 ## OS390BATCH
 ifeq (${OS390BATCH},1)
-BATCH_TARGET = "//'${LOADMOD}(IXM4C35)'"
+BATCH_TARGET = "//'${LOADMOD}(IXM4C40)'"
 endif
 ifneq (${PLATFORM}, OS400)
 LIBNAME=libxerces-c
diff --git a/samples/Makefile.incl b/samples/Makefile.incl
index 9b0182798379064f270c6e28cb7902f0c5ab4b22..b13102ee031c300b811d759ab257612bf53768fa 100644
--- a/samples/Makefile.incl
+++ b/samples/Makefile.incl
@@ -236,7 +236,7 @@ endif
 #   export LOADMOD=USERID.LOAD                                    #
 #   export LOADEXP=SYS1.SIXMEXP or &hlq.SIXMEXP                   #
 #                                                                 #
-# to specify your LOADMOD and the IXM4C31 definition sidedeck     #
+# to specify your LOADMOD and the IXM4C40 definition sidedeck     #
 # dataset.  													  #
 ###################################################################
 
@@ -255,7 +255,7 @@ SHLIBSUFFIX=.dll
 OS390SIDEDECK=.x
 ## OS390BATCH
 ifeq (${OS390BATCH},1)
-LIBRARY_NAMES="//'${LOADEXP}(IXM4C35)'"
+LIBRARY_NAMES="//'${LOADEXP}(IXM4C40)'"
 else
 LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${VER}${OS390SIDEDECK}
 endif
diff --git a/src/Makefile.incl b/src/Makefile.incl
index a317433fb5bc192a6c47cf7c7f3e28698b2cae69..9871b0f5047f9dde041a06b7beb2148be1a9f7f2 100644
--- a/src/Makefile.incl
+++ b/src/Makefile.incl
@@ -359,9 +359,9 @@ MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -W l,dll ${LDFLAGS}
 ifeq (${TRANSCODER}, ICU)
 ## OS390BATCH
     ifeq (${OS390BATCH},1)
-	ALLLIBS = "//'${LOADEXP}(IXMICUUC)'"
+	ALLLIBS = "//'${LOADEXP}(IXMI20UC)'"
     else
-	ALLLIBS = ${ICUROOT}/lib/libicuuc.x
+	ALLLIBS = ${ICUROOT}/lib/libicuuc.20.0.x
     endif
 else
 	ALLLIBS =
diff --git a/tests/InitTermTest/Makefile.in b/tests/InitTermTest/Makefile.in
index f15d8344f587ee1a979e363eaf4e64b6d7135634..cca400aedeb35e220f0668e9aedce3badb2cb145 100644
--- a/tests/InitTermTest/Makefile.in
+++ b/tests/InitTermTest/Makefile.in
@@ -90,7 +90,7 @@ INCLUDE = ${INCLUDES}
 
 ## OS390BATCH
 ifeq (${OS390BATCH},1)
-BATCH_TARGET= "//'${LOADMOD}(${APP_NAME})'"
+BATCH_TARGET= "//'${LOADMOD}(INTTERTS)'"
 all:: makedir ${BATCH_TARGET}
 else
 all:: makedir ${EXEC}/${APP_NAME}
diff --git a/tests/Makefile.incl b/tests/Makefile.incl
index 9b0182798379064f270c6e28cb7902f0c5ab4b22..b13102ee031c300b811d759ab257612bf53768fa 100644
--- a/tests/Makefile.incl
+++ b/tests/Makefile.incl
@@ -236,7 +236,7 @@ endif
 #   export LOADMOD=USERID.LOAD                                    #
 #   export LOADEXP=SYS1.SIXMEXP or &hlq.SIXMEXP                   #
 #                                                                 #
-# to specify your LOADMOD and the IXM4C31 definition sidedeck     #
+# to specify your LOADMOD and the IXM4C40 definition sidedeck     #
 # dataset.  													  #
 ###################################################################
 
@@ -255,7 +255,7 @@ SHLIBSUFFIX=.dll
 OS390SIDEDECK=.x
 ## OS390BATCH
 ifeq (${OS390BATCH},1)
-LIBRARY_NAMES="//'${LOADEXP}(IXM4C35)'"
+LIBRARY_NAMES="//'${LOADEXP}(IXM4C40)'"
 else
 LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${VER}${OS390SIDEDECK}
 endif