3 files changed, 13 insertions, 13 deletions
diff --git a/tests/bindingstest.cpp b/tests/bindingstest.cpp
index 6391666..ec56712 100644
--- a/tests/bindingstest.cpp
+++ b/tests/bindingstest.cpp
@@ -105,19 +105,19 @@ void BindingsTest::snippetConfigurationCompletness()
     QCOMPARE(re.snippets(), snippets);
 }
 
-void BindingsTest::tagConfigurationCompletness()
+void BindingsTest::relationConfigurationCompletness()
 {
-    Kolab::Tag tag("name1", "type1");
-    tag.setColor("color");
-    tag.setIconName("icon");
-    tag.setParent("parent");
-    tag.setPriority(3);
+    Kolab::Relation relation("name1", "type1");
+    relation.setColor("color");
+    relation.setIconName("icon");
+    relation.setParent("parent");
+    relation.setPriority(3);
     std::vector<std::string> members;
     members.push_back("member1");
     members.push_back("member2");
-    tag.setMembers(members);
+    relation.setMembers(members);
 
-    Kolab::Configuration configuration(tag);
+    Kolab::Configuration configuration(relation);
     configuration.setUid("uid");
     configuration.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
     configuration.setLastModified(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC
@@ -130,8 +130,8 @@ void BindingsTest::tagConfigurationCompletness()
     QCOMPARE(re.uid(), configuration.uid());
     QCOMPARE(re.created(), configuration.created());
     QCOMPARE(re.lastModified(), configuration.lastModified());
-    QCOMPARE(re.type(), Kolab::Configuration::TypeTag);
-    QCOMPARE(re.tag(), tag);
+    QCOMPARE(re.type(), Kolab::Configuration::TypeRelation);
+    QCOMPARE(re.relation(), relation);
 }
 
 void BindingsTest::noteCompletness()
diff --git a/tests/bindingstest.h b/tests/bindingstest.h
index a262817..5d04e11 100644
--- a/tests/bindingstest.h
+++ b/tests/bindingstest.h
@@ -25,7 +25,7 @@ class BindingsTest : public QObject
     void categorycolorConfigurationCompletness();
     void dictionaryConfigurationCompletness();
     void snippetConfigurationCompletness();
-    void tagConfigurationCompletness();
+    void relationConfigurationCompletness();
     void noteCompletness();
     void fileCompletness();
     void eventCompletness();
diff --git a/tests/validationtest.cpp b/tests/validationtest.cpp
index a1a1c04..0273646 100644
--- a/tests/validationtest.cpp
+++ b/tests/validationtest.cpp
@@ -76,13 +76,13 @@ void ValidationTest::testDifferentTimezones()
     event.setStart(cDateTime("Europe/Zurich",2013,1,1,1,1,1));
     event.setEnd(cDateTime("Europe/London",2013,1,1,1,1,1));
     writeEvent(event);
-    QCOMPARE(Kolab::error(), Kolab::Error);
+    QCOMPARE(Kolab::error(), Kolab::NoError);
 
     Todo todo;
     todo.setStart(cDateTime("Europe/Zurich",2013,1,1,1,1,1));
     todo.setDue(cDateTime("Europe/London",2013,1,1,1,1,1));
     writeTodo(todo);
-    QCOMPARE(Kolab::error(), Kolab::Error);
+    QCOMPARE(Kolab::error(), Kolab::NoError);
 }
 
 void ValidationTest::testUTCwithTimezone()