diff --git a/hcore/deviceManager/deviceManager.cpp b/hcore/deviceManager/deviceManager.cpp
index c91b7fe..4c66d25 100644
--- a/hcore/deviceManager/deviceManager.cpp
+++ b/hcore/deviceManager/deviceManager.cpp
@@ -22,9 +22,9 @@ std::ostream& operator<<(
     for (auto it = spec.apiParams.begin(); it != spec.apiParams.end(); ++it) {
         os << *it << (it + 1 == spec.apiParams.end() ? "" : " ");
     }
-    os << "), Server: " << spec.server << ", Server Params: (";
-    for (auto it = spec.serverParams.begin(); it != spec.serverParams.end(); ++it) {
-        os << *it << (it + 1 == spec.serverParams.end() ? "" : " ");
+    os << "), Provider: " << spec.provider << ", Provider Params: (";
+    for (auto it = spec.providerParams.begin(); it != spec.providerParams.end(); ++it) {
+        os << *it << (it + 1 == spec.providerParams.end() ? "" : " ");
     }
     os << "), Device Selector: " << spec.deviceSelector << std::endl;
     return os;
diff --git a/hcore/deviceManager/deviceSpecp.yy b/hcore/deviceManager/deviceSpecp.yy
index 8cb6df9..88b277e 100644
--- a/hcore/deviceManager/deviceSpecp.yy
+++ b/hcore/deviceManager/deviceSpecp.yy
@@ -97,8 +97,8 @@ spec_body:
         $$->implexor = std::string($1);
         $$->api = std::string($3);
         $$->apiParams = std::move(*$5);
-        $$->server = std::string($8);
-        $$->serverParams = std::move(*$10);
+        $$->provider = std::string($8);
+        $$->providerParams = std::move(*$10);
         $$->deviceSelector = std::string($13);
         delete $5;
         delete $10;
diff --git a/hcore/include/deviceManager/deviceManager.h b/hcore/include/deviceManager/deviceManager.h
index f7760d6..94b0a78 100644
--- a/hcore/include/deviceManager/deviceManager.h
+++ b/hcore/include/deviceManager/deviceManager.h
@@ -16,8 +16,8 @@ public:
         std::string implexor;
         std::string api;
         std::vector<std::string> apiParams;
-        std::string server;
-        std::vector<std::string> serverParams;
+        std::string provider;
+        std::vector<std::string> providerParams;
         std::string deviceSelector;
 
         friend std::ostream& operator<<(