diff --git a/data/storage/mysql/create_tariffplan_tables.sql b/data/storage/mysql/create_tariffplan_tables.sql
index 2a7b74ae8..13910883a 100644
--- a/data/storage/mysql/create_tariffplan_tables.sql
+++ b/data/storage/mysql/create_tariffplan_tables.sql
@@ -99,7 +99,7 @@ CREATE TABLE `tp_rating_profiles` (
   `subject` varchar(64) NOT NULL,
   `activation_time` varchar(24) NOT NULL,
   `rating_plan_tag` varchar(64) NOT NULL,
-  `rates_fallback_subject` varchar(64),
+  `fallback_subject` varchar(64),
   PRIMARY KEY (`id`),
   KEY `tpid_tag` (`tpid`, `tag`),
   UNIQUE KEY `tpid_tag_tenant_tor_dir_subj_atime` (`tpid`,`tag`, `tenant`,`tor`,`direction`,`subject`,`activation_time`)
diff --git a/data/tariffplans/fs_germany_prep1/ActionTriggers.csv b/data/tariffplans/fs_germany_prep1/ActionTriggers.csv
index b2cdce3df..22d063dfa 100644
--- a/data/tariffplans/fs_germany_prep1/ActionTriggers.csv
+++ b/data/tariffplans/fs_germany_prep1/ActionTriggers.csv
@@ -1,4 +1,4 @@
-#Tag,BalanceTag,Direction,ThresholdType,ThresholdValue,DestinationTag,ActionsTag,Weight
+#Tag,BalanceType,Direction,ThresholdType,ThresholdValue,DestinationTag,ActionsTag,Weight
 STANDARD_TRIGGERS,*monetary,*out,*min_balance,2,,LOG_BALANCE,10
 STANDARD_TRIGGERS,*monetary,*out,*max_balance,20,,LOG_BALANCE,10
 STANDARD_TRIGGERS,*monetary,*out,*max_counter,15,FS_USERS,LOG_BALANCE,10
diff --git a/data/tariffplans/fs_germany_prep1/DestinationRateTimings.csv b/data/tariffplans/fs_germany_prep1/RatingPlans.csv
similarity index 100%
rename from data/tariffplans/fs_germany_prep1/DestinationRateTimings.csv
rename to data/tariffplans/fs_germany_prep1/RatingPlans.csv
diff --git a/data/tariffplans/fs_germany_prep1/RatingProfiles.csv b/data/tariffplans/fs_germany_prep1/RatingProfiles.csv
index 7cea6c691..4c7c1dbd3 100644
--- a/data/tariffplans/fs_germany_prep1/RatingProfiles.csv
+++ b/data/tariffplans/fs_germany_prep1/RatingProfiles.csv
@@ -1,2 +1,2 @@
-#Tenant,TOR,Direction,Subject,ActivationTime,DestinationRateTimingTag,RatesFallbackSubject
+#Tenant,TOR,Direction,Subject,ActivationTime,RatingPlanTag,FallbackSubject
 cgrates.org,call,*out,*any,2012-01-01T00:00:00Z,RETAIL1,
diff --git a/data/tariffplans/prepaid1centpsec/ActionTriggers.csv b/data/tariffplans/prepaid1centpsec/ActionTriggers.csv
index b2cdce3df..22d063dfa 100644
--- a/data/tariffplans/prepaid1centpsec/ActionTriggers.csv
+++ b/data/tariffplans/prepaid1centpsec/ActionTriggers.csv
@@ -1,4 +1,4 @@
-#Tag,BalanceTag,Direction,ThresholdType,ThresholdValue,DestinationTag,ActionsTag,Weight
+#Tag,BalanceType,Direction,ThresholdType,ThresholdValue,DestinationTag,ActionsTag,Weight
 STANDARD_TRIGGERS,*monetary,*out,*min_balance,2,,LOG_BALANCE,10
 STANDARD_TRIGGERS,*monetary,*out,*max_balance,20,,LOG_BALANCE,10
 STANDARD_TRIGGERS,*monetary,*out,*max_counter,15,FS_USERS,LOG_BALANCE,10
diff --git a/data/tariffplans/prepaid1centpsec/DestinationRateTimings.csv b/data/tariffplans/prepaid1centpsec/RatingPlans.csv
similarity index 100%
rename from data/tariffplans/prepaid1centpsec/DestinationRateTimings.csv
rename to data/tariffplans/prepaid1centpsec/RatingPlans.csv
diff --git a/data/tariffplans/prepaid1centpsec/RatingProfiles.csv b/data/tariffplans/prepaid1centpsec/RatingProfiles.csv
index 7cea6c691..4c7c1dbd3 100644
--- a/data/tariffplans/prepaid1centpsec/RatingProfiles.csv
+++ b/data/tariffplans/prepaid1centpsec/RatingProfiles.csv
@@ -1,2 +1,2 @@
-#Tenant,TOR,Direction,Subject,ActivationTime,DestinationRateTimingTag,RatesFallbackSubject
+#Tenant,TOR,Direction,Subject,ActivationTime,RatingPlanTag,FallbackSubject
 cgrates.org,call,*out,*any,2012-01-01T00:00:00Z,RETAIL1,