diff --git a/src/libcalamares/Job.cpp b/src/libcalamares/Job.cpp
index 82244d1b0..bf9229f7c 100644
--- a/src/libcalamares/Job.cpp
+++ b/src/libcalamares/Job.cpp
@@ -22,7 +22,7 @@ namespace Calamares
 {
 
 
-Calamares::JobResult::operator bool() const
+JobResult::operator bool() const
 {
     return m_ok;
 }
diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp
index c87c6a32d..a1badcf86 100644
--- a/src/libcalamares/JobQueue.cpp
+++ b/src/libcalamares/JobQueue.cpp
@@ -46,7 +46,7 @@ public:
 #endif
     }
 
-    void setJobs( const QList< Calamares::job_ptr >& jobs )
+    void setJobs( const QList< job_ptr >& jobs )
     {
         m_jobs = jobs;
     }
@@ -73,7 +73,7 @@ public:
     }
 
 private:
-    QList< Calamares::job_ptr > m_jobs;
+    QList< job_ptr > m_jobs;
     JobQueue* m_queue;
     int m_jobIndex;
 
@@ -155,7 +155,7 @@ JobQueue::start()
 
 
 void
-JobQueue::enqueue( const Calamares::job_ptr& job )
+JobQueue::enqueue( const job_ptr& job )
 {
     Q_ASSERT( !m_thread->isRunning() );
     m_jobs.append( job );
diff --git a/src/libcalamares/JobQueue.h b/src/libcalamares/JobQueue.h
index 6e04e9464..903783d53 100644
--- a/src/libcalamares/JobQueue.h
+++ b/src/libcalamares/JobQueue.h
@@ -41,12 +41,12 @@ public:
 
     GlobalStorage* globalStorage() const;
 
-    void enqueue( const Calamares::job_ptr& job );
-    void enqueue( const QList< Calamares::job_ptr >& jobs );
+    void enqueue( const job_ptr& job );
+    void enqueue( const QList< job_ptr >& jobs );
     void start();
 
 signals:
-    void queueChanged( const QList< Calamares::job_ptr >& jobs );
+    void queueChanged( const QList< job_ptr >& jobs );
     void progress( qreal percent, const QString& prettyName );
     void finished();
     void failed( const QString& message, const QString& details );
@@ -54,7 +54,7 @@ signals:
 private:
     static JobQueue* s_instance;
 
-    QList< Calamares::job_ptr > m_jobs;
+    QList< job_ptr > m_jobs;
     JobThread* m_thread;
     GlobalStorage* m_storage;
 };