diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cac55b..50078e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,8 @@ qt_standard_project_setup()
 
 qt_add_executable(appwifipicker
     main.cpp
-    networkscanner.h
-    networkscanner.cpp
+    networkmanager.h
+    networkmanager.cpp
     networksmodel.cpp
     networksmodel.h
     network.cpp
diff --git a/networkscanner.cpp b/networkmanager.cpp
similarity index 92%
rename from networkscanner.cpp
rename to networkmanager.cpp
index 495b27e..802583e 100644
--- a/networkscanner.cpp
+++ b/networkmanager.cpp
@@ -1,10 +1,11 @@
-#include "networkscanner.h"
+#include "networkmanager.h"
 #include <iostream>
 #include <QAbstractListModel>
 #include <iwlib.h>
 #include <string>
 #include <vector>
 #include <sstream>
+#include <network.h>
 
 std::string exec(const char* cmd) {
     std::array<char, 128> buffer;
@@ -19,7 +20,7 @@ std::string exec(const char* cmd) {
     return result;
 }
 
-QList<Network> NetworkScanner::scanForNetworks()
+QList<Network> NetworkManager::scanForNetworks()
 {
     std::cout << "Called the C++ Network scanner class" << std::endl;
 
diff --git a/networkmanager.h b/networkmanager.h
new file mode 100644
index 0000000..2ce04e9
--- /dev/null
+++ b/networkmanager.h
@@ -0,0 +1,15 @@
+#ifndef NETWORKMANAGER_H
+#define NETWORKMANAGER_H
+
+#include <QObject>
+#include <QAbstractListModel>
+#include <network.h>
+
+class NetworkManager : public QObject
+{
+    Q_OBJECT
+public:
+    QList<Network> scanForNetworks();
+};
+
+#endif // NETWORKMANAGER_H
diff --git a/networkscanner.h b/networkscanner.h
deleted file mode 100644
index 4540526..0000000
--- a/networkscanner.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef NETWORKSCANNER_H
-#define NETWORKSCANNER_H
-
-#include <QObject>
-#include <QAbstractListModel>
-
-class Network
-{
-public:
-    Network(const QString &name);
-
-    QString name() const;
-private:
-    QString m_name;
-};
-
-class NetworkScanner : public QObject
-{
-    Q_OBJECT
-public:
-    QList<Network> scanForNetworks();
-};
-
-#endif // NETWORKSCANNER_H
diff --git a/networksmodel.cpp b/networksmodel.cpp
index eddd3fb..7a54133 100644
--- a/networksmodel.cpp
+++ b/networksmodel.cpp
@@ -36,7 +36,7 @@ void NetworksModel::scan()
 {
     beginResetModel();
 
-    QList<Network> networks = this->m_networkScanner.scanForNetworks();
+    QList<Network> networks = this->m_networkmanager.scanForNetworks();
     this->m_networks = networks;
 
     endResetModel();
diff --git a/networksmodel.h b/networksmodel.h
index ac24182..c0e06d5 100644
--- a/networksmodel.h
+++ b/networksmodel.h
@@ -2,7 +2,7 @@
 #define NETWORKSMODEL_H
 
 #include <QAbstractListModel>
-#include "networkscanner.h"
+#include "networkmanager.h"
 
 class NetworksModel : public QAbstractListModel
 {
@@ -25,7 +25,7 @@ protected:
 
 private:
     QList<Network> m_networks;
-    NetworkScanner m_networkScanner;
+    NetworkManager m_networkmanager;
 };
 
 #endif // NETWORKSMODEL_H