diff --git a/context.cpp b/context.cpp
index 801cfba2d..a4e19e30e 100644
--- a/context.cpp
+++ b/context.cpp
@@ -38,20 +38,20 @@ Context::~Context()
       delete d;
 }
 
-void Context::createContext(const QString &name)
+void Context::createActivity(const QString &name)
 {
 }
 
-QStringList Context::contexts() const
+QStringList Context::listActivities() const
 {
     return QStringList();
 }
 
-void Context::setCurrentContext(const QString &name)
+void Context::setCurrentActivity(const QString &name)
 {
 }
 
-QString Context::currentContext() const
+QString Context::currentActivity() const
 {
     return QString();
 }
diff --git a/context.h b/context.h
index 18bb62b97..e16af37e5 100644
--- a/context.h
+++ b/context.h
@@ -38,11 +38,11 @@ public:
     explicit Context(QObject *parent = 0);
     ~Context();
 
-    void createContext(const QString &name);
-    QStringList contexts() const;
+    void createActivity(const QString &name);
+    QStringList listActivities() const;
 
-    void setCurrentContext(const QString &name);
-    QString currentContext() const;
+    void setCurrentActivity(const QString &name);
+    QString currentActivity() const;
 
 Q_SIGNALS:
     void currentChanged(const QString &);