diff --git a/data/storage/mysql/create_tariffplan_tables.sql b/data/storage/mysql/create_tariffplan_tables.sql
index 5d4af75ee..0b5b9df1f 100644
--- a/data/storage/mysql/create_tariffplan_tables.sql
+++ b/data/storage/mysql/create_tariffplan_tables.sql
@@ -147,10 +147,10 @@ CREATE TABLE `tp_actions` (
   `action` varchar(24) NOT NULL,
   `balance_tag` varchar(64) NOT NULL,
   `balance_type` varchar(24) NOT NULL,
-  `direction` varchar(8) NOT NULL,
+  `balance_direction` varchar(8) NOT NULL,
   `units` DECIMAL(20,4) NOT NULL,
   `expiry_time` varchar(24) NOT NULL,
-  `destination_tag` varchar(64) NOT NULL,
+  `balance_destination_tag` varchar(64) NOT NULL,
   `rating_subject` varchar(64) NOT NULL,
   `category` varchar(16) NOT NULL,
   `shared_group` varchar(64) NOT NULL,
diff --git a/data/storage/postgres/create_tariffplan_tables.sql b/data/storage/postgres/create_tariffplan_tables.sql
index ebb8d252e..d76070b7c 100644
--- a/data/storage/postgres/create_tariffplan_tables.sql
+++ b/data/storage/postgres/create_tariffplan_tables.sql
@@ -169,12 +169,12 @@ CREATE TABLE tp_action_triggers (
   tag VARCHAR(64) NOT NULL,
   balance_tag VARCHAR(64) NOT NULL,
   balance_type VARCHAR(24) NOT NULL,
-  direction VARCHAR(8) NOT NULL,
+  balance_direction VARCHAR(8) NOT NULL,
   threshold_type char(12) NOT NULL,
   threshold_value NUMERIC(20,4) NOT NULL,
   recurrent BOOLEAN NOT NULL,
   min_sleep INTEGER NOT NULL,
-  destination_tag VARCHAR(64) NOT NULL,
+  balance_destination_tag VARCHAR(64) NOT NULL,
   balance_weight NUMERIC(8,2) NOT NULL, 
   balance_expiry_time VARCHAR(24) NOT NULL, 
   balance_rating_subject VARCHAR(64) NOT NULL,