diff --git a/00-init.sql b/00-init.sql
index 50eac276247c2e2a4ba5887923182f9073c37557..8e19a29a8811fdeda5af50c51619bb3146c9dc5f 100644
--- a/00-init.sql
+++ b/00-init.sql
@@ -139,8 +139,8 @@ CREATE TABLE deleted_node (
 
 
 CREATE TABLE users (
-    rap_id            VARCHAR       NOT NULL,
+    user_id            VARCHAR       NOT NULL,
     user_name         VARCHAR       NOT NULL,
     e_mail            VARCHAR       NOT NULL,
-    PRIMARY KEY (rap_id)
+    PRIMARY KEY (user_id)
 );
diff --git a/05-data.sql b/05-data.sql
index acb899597123ec95a6dab880fa3271ce4bfbea7c..86c72705c4c678a63503069c9fd803cbc5733d30 100644
--- a/05-data.sql
+++ b/05-data.sql
@@ -20,7 +20,7 @@ INSERT INTO location (location_type, storage_src_id, storage_dest_id) VALUES ('p
 
 
 /*
-   Initialization test for vospace node table; for now owner_id and group_id are set equal to the rap_id
+   Initialization test for vospace node table; for now owner_id and group_id are set equal to the user_id
 */
 
 
@@ -40,6 +40,6 @@ INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creat
    Initialization test for vospace users table
 */
 
-INSERT INTO Users (rap_id, user_name, e_mail) VALUES ('3354', 'cristiano.urban', 'cristiano.urban@inaf.it');
-INSERT INTO Users (rap_id, user_name, e_mail) VALUES ('2048', 'sara.bertocco', 'sara.bertocco@inaf.it');
-INSERT INTO Users (rap_id, user_name, e_mail) VALUES ('2386', 'sonia.zorba', 'sonia.zorba@inaf.it');
+INSERT INTO Users (user_id, user_name, e_mail) VALUES ('3354', 'cristiano.urban', 'cristiano.urban@inaf.it');
+INSERT INTO Users (user_id, user_name, e_mail) VALUES ('2048', 'sara.bertocco', 'sara.bertocco@inaf.it');
+INSERT INTO Users (user_id, user_name, e_mail) VALUES ('2386', 'sonia.zorba', 'sonia.zorba@inaf.it');