diff --git a/data/tariffplans/tutorial2/AccountActions.csv b/data/tariffplans/tutorial/AccountActions.csv
similarity index 100%
rename from data/tariffplans/tutorial2/AccountActions.csv
rename to data/tariffplans/tutorial/AccountActions.csv
diff --git a/data/tariffplans/tutorial2/ActionPlans.csv b/data/tariffplans/tutorial/ActionPlans.csv
similarity index 100%
rename from data/tariffplans/tutorial2/ActionPlans.csv
rename to data/tariffplans/tutorial/ActionPlans.csv
diff --git a/data/tariffplans/tutorial2/Actions.csv b/data/tariffplans/tutorial/Actions.csv
similarity index 100%
rename from data/tariffplans/tutorial2/Actions.csv
rename to data/tariffplans/tutorial/Actions.csv
diff --git a/data/tariffplans/tutorial2/Attributes.csv b/data/tariffplans/tutorial/Attributes.csv
similarity index 100%
rename from data/tariffplans/tutorial2/Attributes.csv
rename to data/tariffplans/tutorial/Attributes.csv
diff --git a/data/tariffplans/tutorial2/DestinationRates.csv b/data/tariffplans/tutorial/DestinationRates.csv
similarity index 100%
rename from data/tariffplans/tutorial2/DestinationRates.csv
rename to data/tariffplans/tutorial/DestinationRates.csv
diff --git a/data/tariffplans/tutorial2/Destinations.csv b/data/tariffplans/tutorial/Destinations.csv
similarity index 100%
rename from data/tariffplans/tutorial2/Destinations.csv
rename to data/tariffplans/tutorial/Destinations.csv
diff --git a/data/tariffplans/tutorial2/Filters.csv b/data/tariffplans/tutorial/Filters.csv
similarity index 100%
rename from data/tariffplans/tutorial2/Filters.csv
rename to data/tariffplans/tutorial/Filters.csv
diff --git a/data/tariffplans/tutorial2/Rates.csv b/data/tariffplans/tutorial/Rates.csv
similarity index 100%
rename from data/tariffplans/tutorial2/Rates.csv
rename to data/tariffplans/tutorial/Rates.csv
diff --git a/data/tariffplans/tutorial2/RatingPlans.csv b/data/tariffplans/tutorial/RatingPlans.csv
similarity index 100%
rename from data/tariffplans/tutorial2/RatingPlans.csv
rename to data/tariffplans/tutorial/RatingPlans.csv
diff --git a/data/tariffplans/tutorial2/RatingProfiles.csv b/data/tariffplans/tutorial/RatingProfiles.csv
similarity index 100%
rename from data/tariffplans/tutorial2/RatingProfiles.csv
rename to data/tariffplans/tutorial/RatingProfiles.csv
diff --git a/data/tariffplans/tutorial2/Resources.csv b/data/tariffplans/tutorial/Resources.csv
similarity index 100%
rename from data/tariffplans/tutorial2/Resources.csv
rename to data/tariffplans/tutorial/Resources.csv
diff --git a/data/tariffplans/tutorial2/Stats.csv b/data/tariffplans/tutorial/Stats.csv
similarity index 100%
rename from data/tariffplans/tutorial2/Stats.csv
rename to data/tariffplans/tutorial/Stats.csv
diff --git a/data/tariffplans/tutorial2/Suppliers.csv b/data/tariffplans/tutorial/Suppliers.csv
similarity index 100%
rename from data/tariffplans/tutorial2/Suppliers.csv
rename to data/tariffplans/tutorial/Suppliers.csv
diff --git a/data/tariffplans/tutorial2/Thresholds.csv b/data/tariffplans/tutorial/Thresholds.csv
similarity index 100%
rename from data/tariffplans/tutorial2/Thresholds.csv
rename to data/tariffplans/tutorial/Thresholds.csv
diff --git a/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json b/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json
index 446b16eb7..0d3157813 100644
--- a/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json
@@ -81,7 +81,7 @@
 		{"address": "127.0.0.1:2012", "transport": "*json"}
 	],
 	"debit_interval": "5s",
-	"channel_sync_interval":"5s",
+	"channel_sync_interval":"7s",
 },
 
 
diff --git a/dispatcher/attributes_it_test.go b/dispatcher/attributes_it_test.go
index a8ff95d2e..6c542cf8a 100755
--- a/dispatcher/attributes_it_test.go
+++ b/dispatcher/attributes_it_test.go
@@ -138,7 +138,7 @@ func testDspAttrPing(t *testing.T) {
 func testDspAttrLoadData(t *testing.T) {
 	var reply string
 	attrs := &utils.AttrLoadTpFromFolder{
-		FolderPath: path.Join(dspDataDir, "tariffplans", "tutorial2")}
+		FolderPath: path.Join(dspDataDir, "tariffplans", "tutorial")}
 	if err := instAttrRPC.Call("ApierV1.LoadTariffPlanFromFolder", attrs, &reply); err != nil {
 		t.Error(err)
 	}
diff --git a/dispatcher/resources_it_test.go b/dispatcher/resources_it_test.go
index 0db2fab94..89ca99752 100755
--- a/dispatcher/resources_it_test.go
+++ b/dispatcher/resources_it_test.go
@@ -136,7 +136,7 @@ func testDspResPing(t *testing.T) {
 func testDspResLoadData(t *testing.T) {
 	var reply string
 	attrs := &utils.AttrLoadTpFromFolder{
-		FolderPath: path.Join(dspDataDir, "tariffplans", "tutorial2")}
+		FolderPath: path.Join(dspDataDir, "tariffplans", "tutorial")}
 	if err := instResRPC.Call("ApierV1.LoadTariffPlanFromFolder", attrs, &reply); err != nil {
 		t.Error(err)
 	}
diff --git a/dispatcher/stats_it_test.go b/dispatcher/stats_it_test.go
index 22af5e028..d64827030 100755
--- a/dispatcher/stats_it_test.go
+++ b/dispatcher/stats_it_test.go
@@ -136,7 +136,7 @@ func testDspStsPing(t *testing.T) {
 func testDspStsLoadData(t *testing.T) {
 	var reply string
 	Stss := &utils.AttrLoadTpFromFolder{
-		FolderPath: path.Join(dspDataDir, "tariffplans", "tutorial2")}
+		FolderPath: path.Join(dspDataDir, "tariffplans", "tutorial")}
 	if err := instStsRPC.Call("ApierV1.LoadTariffPlanFromFolder", Stss, &reply); err != nil {
 		t.Error(err)
 	}
diff --git a/dispatcher/suppliers_it_test.go b/dispatcher/suppliers_it_test.go
index 991c3314e..083c73fac 100755
--- a/dispatcher/suppliers_it_test.go
+++ b/dispatcher/suppliers_it_test.go
@@ -136,7 +136,7 @@ func testDspSupPing(t *testing.T) {
 func testDspSupLoadData(t *testing.T) {
 	var reply string
 	attrs := &utils.AttrLoadTpFromFolder{
-		FolderPath: path.Join(dspDataDir, "tariffplans", "tutorial2")}
+		FolderPath: path.Join(dspDataDir, "tariffplans", "tutorial")}
 	if err := instSupRPC.Call("ApierV1.LoadTariffPlanFromFolder", attrs, &reply); err != nil {
 		t.Error(err)
 	}
diff --git a/dispatcher/thresholds_it_test.go b/dispatcher/thresholds_it_test.go
index 8b80a74c8..937ff4adb 100755
--- a/dispatcher/thresholds_it_test.go
+++ b/dispatcher/thresholds_it_test.go
@@ -135,7 +135,7 @@ func testDspThPing(t *testing.T) {
 func testDspThLoadData(t *testing.T) {
 	var reply string
 	attrs := &utils.AttrLoadTpFromFolder{
-		FolderPath: path.Join(dspDataDir, "tariffplans", "tutorial2")}
+		FolderPath: path.Join(dspDataDir, "tariffplans", "tutorial")}
 	if err := instThRPC.Call("ApierV1.LoadTariffPlanFromFolder", attrs, &reply); err != nil {
 		t.Error(err)
 	}
diff --git a/general_tests/tutorial_calls_test.go b/general_tests/tutorial_calls_test.go
index 80629e694..5742d61eb 100755
--- a/general_tests/tutorial_calls_test.go
+++ b/general_tests/tutorial_calls_test.go
@@ -251,7 +251,7 @@ func testCallRpcConn(t *testing.T) {
 // Load the tariff plan, creating accounts and their balances
 func testCallLoadTariffPlanFromFolder(t *testing.T) {
 	var reply string
-	attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "tutorial2")}
+	attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "tutorial")}
 	if err := tutorialCallsRpc.Call("ApierV1.LoadTariffPlanFromFolder", attrs, &reply); err != nil {
 		t.Error(err)
 	}