diff --git a/mediachanger/castorrmc/h/rmc_constants.h b/mediachanger/castorrmc/h/rmc_constants.h
index fd5ff757b58af8385c88a2cacf9c0f41ab618e3f..fbfd5d81f6d2dbddc0c602326ec66692005343bd 100644
--- a/mediachanger/castorrmc/h/rmc_constants.h
+++ b/mediachanger/castorrmc/h/rmc_constants.h
@@ -32,15 +32,15 @@
/* Request types */
-#define RMC_GETGEOM 1 /* Get robot geometry */
-#define RMC_FINDCART 2 /* Find cartridge(s) */
-#define RMC_READELEM 3 /* Read element status */
-#define RMC_MOUNT 4 /* Mount request */
-#define RMC_UNMOUNT 5 /* Unmount request */
-#define RMC_EXPORT 6 /* Export tape request */
-#define RMC_IMPORT 7 /* Import tape request */
-#define RMC_ACS_MOUNT 8 /* ACS mount request */
-#define RMC_ACS_UNMOUNT 9 /* ACS unmount request */
+#define RMC_SCSI_GETGEOM 1 /* Get robot geometry */
+#define RMC_SCSI_FINDCART 2 /* Find cartridge(s) */
+#define RMC_SCSI_READELEM 3 /* Read element status */
+#define RMC_SCSI_MOUNT 4 /* Mount request */
+#define RMC_SCSI_UNMOUNT 5 /* Unmount request */
+#define RMC_SCSI_EXPORT 6 /* Export tape request */
+#define RMC_SCSI_IMPORT 7 /* Import tape request */
+#define RMC_ACS_MOUNT 8 /* ACS mount request */
+#define RMC_ACS_UNMOUNT 9 /* ACS unmount request */
/* SCSI media changer server reply types */
diff --git a/mediachanger/castorrmc/rmc/rmc_dismount.c b/mediachanger/castorrmc/rmc/rmc_dismount.c
index 6b4690177177747d55dc168dd8ca17e30ca156db..1831f4f3f2d75cb427a1de04ecde81a04e1c8ab7 100644
--- a/mediachanger/castorrmc/rmc/rmc_dismount.c
+++ b/mediachanger/castorrmc/rmc/rmc_dismount.c
@@ -35,7 +35,7 @@ int rmc_dismount(
sbp = sendbuf;
marshall_LONG (sbp, RMC_MAGIC);
- marshall_LONG (sbp, RMC_UNMOUNT);
+ marshall_LONG (sbp, RMC_SCSI_UNMOUNT);
q = sbp; /* save pointer. The next field will be updated */
msglen = 3 * LONGSIZE;
marshall_LONG (sbp, msglen);
diff --git a/mediachanger/castorrmc/rmc/rmc_export.c b/mediachanger/castorrmc/rmc/rmc_export.c
index 08bc1ccd03eae32eab5c8e4cdfc48ef761b80961..dd8d00f9faf472e938b97f5fbdc06836f5f7e68d 100644
--- a/mediachanger/castorrmc/rmc/rmc_export.c
+++ b/mediachanger/castorrmc/rmc/rmc_export.c
@@ -30,7 +30,7 @@ int rmc_export(const char *const server, const char *const vid)
sbp = sendbuf;
marshall_LONG (sbp, RMC_MAGIC);
- marshall_LONG (sbp, RMC_EXPORT);
+ marshall_LONG (sbp, RMC_SCSI_EXPORT);
q = sbp; /* save pointer. The next field will be updated */
msglen = 3 * LONGSIZE;
marshall_LONG (sbp, msglen);
diff --git a/mediachanger/castorrmc/rmc/rmc_find_cartridge.c b/mediachanger/castorrmc/rmc/rmc_find_cartridge.c
index 8728ba2f4e1dd0285d06f85beaceb08896ddf12c..890e1d1d98cc665a11bb0be79efd5c0ffb1e6ee4 100644
--- a/mediachanger/castorrmc/rmc/rmc_find_cartridge.c
+++ b/mediachanger/castorrmc/rmc/rmc_find_cartridge.c
@@ -40,7 +40,7 @@ int rmc_find_cartridge(
sbp = sendbuf;
marshall_LONG (sbp, RMC_MAGIC);
- marshall_LONG (sbp, RMC_FINDCART);
+ marshall_LONG (sbp, RMC_SCSI_FINDCART);
q = sbp; /* save pointer. The next field will be updated */
msglen = 3 * LONGSIZE;
marshall_LONG (sbp, msglen);
diff --git a/mediachanger/castorrmc/rmc/rmc_get_geometry.c b/mediachanger/castorrmc/rmc/rmc_get_geometry.c
index 16f7e42f5c57ed7f94ae8636bcd92aac904593e4..b6937005bed7b9ea4ca0d4030bd3d1ca4b8fef2b 100644
--- a/mediachanger/castorrmc/rmc/rmc_get_geometry.c
+++ b/mediachanger/castorrmc/rmc/rmc_get_geometry.c
@@ -34,7 +34,7 @@ int rmc_get_geometry(
sbp = sendbuf;
marshall_LONG (sbp, RMC_MAGIC);
- marshall_LONG (sbp, RMC_GETGEOM);
+ marshall_LONG (sbp, RMC_SCSI_GETGEOM);
q = sbp; /* save pointer. The next field will be updated */
msglen = 3 * LONGSIZE;
marshall_LONG (sbp, msglen);
diff --git a/mediachanger/castorrmc/rmc/rmc_import.c b/mediachanger/castorrmc/rmc/rmc_import.c
index bc0d20e3ab2ba984a4ad2c6f65f004105d86d379..73e2280d6c323c2fb05abc5534669a0c16bda5f9 100644
--- a/mediachanger/castorrmc/rmc/rmc_import.c
+++ b/mediachanger/castorrmc/rmc/rmc_import.c
@@ -31,7 +31,7 @@ int rmc_import(const char *const server, const char *const vid)
sbp = sendbuf;
marshall_LONG (sbp, RMC_MAGIC);
- marshall_LONG (sbp, RMC_IMPORT);
+ marshall_LONG (sbp, RMC_SCSI_IMPORT);
q = sbp; /* save pointer. The next field will be updated */
msglen = 3 * LONGSIZE;
marshall_LONG (sbp, msglen);
diff --git a/mediachanger/castorrmc/rmc/rmc_mount.c b/mediachanger/castorrmc/rmc/rmc_mount.c
index aa72260c325419e5dac143eca669ec7383e84b87..94abde365ef16be4f2b7a99c9885a8ac66b85406 100644
--- a/mediachanger/castorrmc/rmc/rmc_mount.c
+++ b/mediachanger/castorrmc/rmc/rmc_mount.c
@@ -35,7 +35,7 @@ int rmc_mount(
sbp = sendbuf;
marshall_LONG (sbp, RMC_MAGIC);
- marshall_LONG (sbp, RMC_MOUNT);
+ marshall_LONG (sbp, RMC_SCSI_MOUNT);
q = sbp; /* save pointer. The next field will be updated */
msglen = 3 * LONGSIZE;
marshall_LONG (sbp, msglen);
diff --git a/mediachanger/castorrmc/rmc/rmc_read_elem_status.c b/mediachanger/castorrmc/rmc/rmc_read_elem_status.c
index 551c256b827ba9b1edf7457ce1da495ae05bf0eb..07dd2a3799ee2df19d293ea2f3d9b17f6a292f51 100644
--- a/mediachanger/castorrmc/rmc/rmc_read_elem_status.c
+++ b/mediachanger/castorrmc/rmc/rmc_read_elem_status.c
@@ -39,7 +39,7 @@ int rmc_read_elem_status(
sbp = sendbuf;
marshall_LONG (sbp, RMC_MAGIC);
- marshall_LONG (sbp, RMC_READELEM);
+ marshall_LONG (sbp, RMC_SCSI_READELEM);
q = sbp; /* save pointer. The next field will be updated */
msglen = 3 * LONGSIZE;
marshall_LONG (sbp, msglen);
diff --git a/mediachanger/castorrmc/rmc/rmc_serv.c b/mediachanger/castorrmc/rmc/rmc_serv.c
index 584a24d3b52f6972f01444841de3d853661f2e96..f230fcc78d553f6912d27309d689585960b2de45 100644
--- a/mediachanger/castorrmc/rmc/rmc_serv.c
+++ b/mediachanger/castorrmc/rmc/rmc_serv.c
@@ -361,25 +361,25 @@ static void procreq(
rqst_context.clienthost = clienthost;
switch (req_type) {
- case RMC_MOUNT:
+ case RMC_SCSI_MOUNT:
c = rmc_srv_mount (&rqst_context);
break;
- case RMC_UNMOUNT:
+ case RMC_SCSI_UNMOUNT:
c = rmc_srv_unmount (&rqst_context);
break;
- case RMC_EXPORT:
+ case RMC_SCSI_EXPORT:
c = rmc_srv_export (&rqst_context);
break;
- case RMC_IMPORT:
+ case RMC_SCSI_IMPORT:
c = rmc_srv_import (&rqst_context);
break;
- case RMC_GETGEOM:
+ case RMC_SCSI_GETGEOM:
c = rmc_srv_getgeom (&rqst_context);
break;
- case RMC_READELEM:
+ case RMC_SCSI_READELEM:
c = rmc_srv_readelem (&rqst_context);
break;
- case RMC_FINDCART:
+ case RMC_SCSI_FINDCART:
c = rmc_srv_findcart (&rqst_context);
break;
case RMC_ACS_MOUNT: