diff --git a/catalogue/common_catalogue_schema.sql b/catalogue/common_catalogue_schema.sql
index e37a2d5022b9a3b87d071002acff2f1171485b29..a5f2a3b80170a6d71f2d5ad4de64a8fe835c2d84 100644
--- a/catalogue/common_catalogue_schema.sql
+++ b/catalogue/common_catalogue_schema.sql
@@ -75,17 +75,17 @@ CREATE TABLE LOGICAL_LIBRARY(
   CONSTRAINT LOGICAL_LIBRARY_ID_BOOL_CK CHECK(IS_DISABLED IN ('0', '1'))
 );
 CREATE TABLE TAPE(
-  VID                     VARCHAR(100)    CONSTRAINT TAPE_V_UN    NOT NULL,
+  VID                     VARCHAR(100)    CONSTRAINT TAPE_V_NN    NOT NULL,
   MEDIA_TYPE              VARCHAR(100)    CONSTRAINT TAPE_MT_NN   NOT NULL,
   VENDOR                  VARCHAR(100)    CONSTRAINT TAPE_V2_NN   NOT NULL,
-  LOGICAL_LIBRARY_NAME    VARCHAR(100)    CONSTRAINT TAPE_LLN_UN  NOT NULL,
-  TAPE_POOL_NAME          VARCHAR(100)    CONSTRAINT TAPE_TPN_UN  NOT NULL,
+  LOGICAL_LIBRARY_NAME    VARCHAR(100)    CONSTRAINT TAPE_LLN_NN  NOT NULL,
+  TAPE_POOL_NAME          VARCHAR(100)    CONSTRAINT TAPE_TPN_NN  NOT NULL,
   ENCRYPTION_KEY          VARCHAR(100),
-  CAPACITY_IN_BYTES       NUMERIC(20, 0)  CONSTRAINT TAPE_CIB_UN  NOT NULL,
-  DATA_IN_BYTES           NUMERIC(20, 0)  CONSTRAINT TAPE_DIB_UN  NOT NULL,
-  LAST_FSEQ               NUMERIC(20, 0)  CONSTRAINT TAPE_LF_UN   NOT NULL,
-  IS_DISABLED             CHAR(1)         CONSTRAINT TAPE_ID_UN   NOT NULL,
-  IS_FULL                 CHAR(1)         CONSTRAINT TAPE_IF_UN   NOT NULL,
+  CAPACITY_IN_BYTES       NUMERIC(20, 0)  CONSTRAINT TAPE_CIB_NN  NOT NULL,
+  DATA_IN_BYTES           NUMERIC(20, 0)  CONSTRAINT TAPE_DIB_NN  NOT NULL,
+  LAST_FSEQ               NUMERIC(20, 0)  CONSTRAINT TAPE_LF_NN   NOT NULL,
+  IS_DISABLED             CHAR(1)         CONSTRAINT TAPE_ID_NN   NOT NULL,
+  IS_FULL                 CHAR(1)         CONSTRAINT TAPE_IF_NN   NOT NULL,
   LABEL_DRIVE             VARCHAR(100),
   LABEL_TIME              NUMERIC(20, 0),
   LAST_READ_DRIVE         VARCHAR(100),
@@ -94,13 +94,13 @@ CREATE TABLE TAPE(
   LAST_WRITE_TIME         NUMERIC(20, 0),
   READ_MOUNT_COUNT        NUMERIC(20, 0)  DEFAULT 0 CONSTRAINT TAPE_RMC_NN NOT NULL,
   WRITE_MOUNT_COUNT       NUMERIC(20, 0)  DEFAULT 0 CONSTRAINT TAPE_WMC_NN NOT NULL,
-  USER_COMMENT            VARCHAR(1000)   CONSTRAINT TAPE_UC_UN   NOT NULL,
-  CREATION_LOG_USER_NAME  VARCHAR(100)    CONSTRAINT TAPE_CLUN_UN NOT NULL,
-  CREATION_LOG_HOST_NAME  VARCHAR(100)    CONSTRAINT TAPE_CLHN_UN NOT NULL,
+  USER_COMMENT            VARCHAR(1000)   CONSTRAINT TAPE_UC_NN   NOT NULL,
+  CREATION_LOG_USER_NAME  VARCHAR(100)    CONSTRAINT TAPE_CLUN_NN NOT NULL,
+  CREATION_LOG_HOST_NAME  VARCHAR(100)    CONSTRAINT TAPE_CLHN_NN NOT NULL,
   CREATION_LOG_TIME       NUMERIC(20, 0)  CONSTRAINT TAPE_CLT_NN  NOT NULL,
-  LAST_UPDATE_USER_NAME   VARCHAR(100)    CONSTRAINT TAPE_LUUN_UN NOT NULL,
-  LAST_UPDATE_HOST_NAME   VARCHAR(100)    CONSTRAINT TAPE_LUHN_UN NOT NULL,
-  LAST_UPDATE_TIME        NUMERIC(20, 0)  CONSTRAINT TAPE_LUT_UN  NOT NULL,
+  LAST_UPDATE_USER_NAME   VARCHAR(100)    CONSTRAINT TAPE_LUUN_NN NOT NULL,
+  LAST_UPDATE_HOST_NAME   VARCHAR(100)    CONSTRAINT TAPE_LUHN_NN NOT NULL,
+  LAST_UPDATE_TIME        NUMERIC(20, 0)  CONSTRAINT TAPE_LUT_NN  NOT NULL,
   CONSTRAINT TAPE_PK PRIMARY KEY(VID),
   CONSTRAINT TAPE_LOGICAL_LIBRARY_FK FOREIGN KEY(LOGICAL_LIBRARY_NAME)
     REFERENCES LOGICAL_LIBRARY(LOGICAL_LIBRARY_NAME),