diff --git a/timespans/kyoto_storage.go b/timespans/storage_kyoto.go
similarity index 100%
rename from timespans/kyoto_storage.go
rename to timespans/storage_kyoto.go
diff --git a/timespans/mongo_storage.go b/timespans/storage_mongo.go
similarity index 100%
rename from timespans/mongo_storage.go
rename to timespans/storage_mongo.go
diff --git a/timespans/redis_storage.go b/timespans/storage_redis.go
similarity index 100%
rename from timespans/redis_storage.go
rename to timespans/storage_redis.go
diff --git a/timespans/tariff_plans_test.go b/timespans/tariff_plans_test.go
index ff1e9cb42..7f93db2c2 100644
--- a/timespans/tariff_plans_test.go
+++ b/timespans/tariff_plans_test.go
@@ -82,7 +82,7 @@ func TestTariffPlanMongoStore(t *testing.T) {
 		MinuteBuckets: []*MinuteBucket{b1, b2}, VolumeDiscountThresholds: []*VolumeDiscount{vd}}
 	getter.SetTariffPlan(seara)
 	result, _ := getter.GetTariffPlan(seara.Id)
-	if reflect.DeepEqual(seara, result) {
+	if !reflect.DeepEqual(seara, result) {
 		t.Log(seara)
 		t.Log(result)
 		t.Errorf("Expected %q was %q", seara, result)