diff --git a/README.md b/README.md
index abfb42d..39229b2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,11 @@
 # DistriNS
 A Distributed approach to Authoritative DNS
 
+## Useful Commands
+```
+inotifywait -m -q -r -e close_write --format %f ../src/ | grep --line-buffered "\.[h,c]pp$" | while IFS= read -r file; do make && src/core/Plains; done
+```
+
 PLAINS - Peering Local Authoratative Integrated Name Server
 
 ## Coding Style
diff --git a/src/api/Server.cpp b/src/api/Server.cpp
index f0fa49c..b73301f 100644
--- a/src/api/Server.cpp
+++ b/src/api/Server.cpp
@@ -3,7 +3,7 @@
 namespace Plains {
 namespace API {
 
-Server::Server(EventBus& eventBus) : eventBus(eventBus) {
+Server::Server(EventBus& eventBus) : eventBus_(eventBus) {
     //Constructor
 }
 
diff --git a/src/api/include/Server.hpp b/src/api/include/Server.hpp
index 23cee0e..e982f89 100644
--- a/src/api/include/Server.hpp
+++ b/src/api/include/Server.hpp
@@ -8,7 +8,7 @@ namespace API {
 using Core::EventBus;
 
 class Server {
-    const EventBus& eventBus;
+    const EventBus& eventBus_;
 
     public:
     Server(EventBus& eventBus);
diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
index df001f2..c66663f 100644
--- a/src/core/ConfigManager.cpp
+++ b/src/core/ConfigManager.cpp
@@ -8,12 +8,12 @@ namespace Core {
 using std::string;
 
 ConfigManager::ConfigManager(Logger& logger, vector<string>& parameters) :
-    logger(logger),
-    parameters(parameters)
+    logger_(logger),
+    parameters_(parameters)
 {
     // move this to a function that can return an error code?
     if ( parameters.size() == 0 ) return;
-    logger.debug.ln("Interpreting Paremters...");
+    logger_.debug.ln("Interpreting Paremters...");
     
     /*
     for (unsigned i = 0; i < (numParameters-1); ++i) {
@@ -21,8 +21,8 @@ ConfigManager::ConfigManager(Logger& logger, vector<string>& parameters) :
         string v = string(parameters[i+1]);
         // Check if this parameter is an argument or an argument value:
         if ( p.compare(0,1,"-") == 0 ) {
-            logger.debug("Interpreting parameter " << p);
-            if ( ! p.compare("--initial-peer") ) logger.debug("Peer " << v << " set");
+            logger_.debug("Interpreting parameter " << p);
+            if ( ! p.compare("--initial-peer") ) logger_.debug("Peer " << v << " set");
         }
     }
     */
diff --git a/src/core/EventBus.cpp b/src/core/EventBus.cpp
index 9e1f2c4..d911275 100644
--- a/src/core/EventBus.cpp
+++ b/src/core/EventBus.cpp
@@ -4,10 +4,10 @@
 namespace Plains {
 namespace Core {
 
-EventBus::EventBus(Logger& logger) : logger(logger) {};
+EventBus::EventBus(Logger& logger) : logger_(logger) {};
 
 void EventBus::test() {
-    logger.debug << "Testing from within EventBus!" << Logger::commit;
+    logger_.debug << "Testing from within EventBus!" << Logger::commit;
 }
 
 
diff --git a/src/core/dns/include/Record.hpp b/src/core/dns/include/Record.hpp
index 11460d1..653b495 100644
--- a/src/core/dns/include/Record.hpp
+++ b/src/core/dns/include/Record.hpp
@@ -14,9 +14,9 @@ using std::string;
 class Record : public Resource
 {
     public:
-    const uint16_t id;
+    const uint16_t id_;
     string serialize();
-    Record(const uint16_t id) : id(id) {}
+    Record(const uint16_t id) : id_(id) {}
 };
 
 class ARecord : public Record { ARecord(); };
diff --git a/src/core/include/ConfigManager.hpp b/src/core/include/ConfigManager.hpp
index ff94a40..68f12a3 100644
--- a/src/core/include/ConfigManager.hpp
+++ b/src/core/include/ConfigManager.hpp
@@ -16,8 +16,8 @@ class ConfigManager
     ConfigManager(Logger& logger, vector<string>& parameters);
 
     private:
-    Logger& logger;
-    const vector<string>& parameters;
+    Logger& logger_;
+    const vector<string>& parameters_;
 };
 
 }}
diff --git a/src/core/include/EventBus.hpp b/src/core/include/EventBus.hpp
index c8d09ed..5f1bcff 100644
--- a/src/core/include/EventBus.hpp
+++ b/src/core/include/EventBus.hpp
@@ -8,7 +8,7 @@ namespace Core {
 
 class EventBus {
     private:
-    Logger& logger;
+    Logger& logger_;
 
     public:
     EventBus(Logger& logger);
diff --git a/src/dhcp/Server.cpp b/src/dhcp/Server.cpp
index 231e2a0..97b33f9 100644
--- a/src/dhcp/Server.cpp
+++ b/src/dhcp/Server.cpp
@@ -3,7 +3,7 @@
 namespace Plains {
 namespace DHCP {
 
-Server::Server(EventBus& eventBus) : eventBus(eventBus) {
+Server::Server(EventBus& eventBus) : eventBus_(eventBus) {
     //Constructor
 }
 
diff --git a/src/dhcp/include/Server.hpp b/src/dhcp/include/Server.hpp
index a8ce16a..39c135f 100644
--- a/src/dhcp/include/Server.hpp
+++ b/src/dhcp/include/Server.hpp
@@ -8,7 +8,7 @@ namespace DHCP {
 using Core::EventBus;
 
 class Server {
-    const EventBus& eventBus;
+    const EventBus& eventBus_;
 
     public:
     Server(EventBus& eventBus);
diff --git a/src/resolver/Server.cpp b/src/resolver/Server.cpp
index 6e6f7d9..23f387a 100644
--- a/src/resolver/Server.cpp
+++ b/src/resolver/Server.cpp
@@ -40,8 +40,8 @@ static char* intToHex(unsigned byteCount, int c) {
 }
 
 Server::Server(Logger& logger, EventBus& eventBus)
-  : logger(logger),
-    eventBus(eventBus)
+  : logger_(logger),
+    eventBus_(eventBus)
 {
     logger.debug << "Testing some stuff..." << Logger::commit;
     logger.debug << "Message header overall size: " << sizeof(Message::Header) << Logger::commit;
@@ -76,7 +76,7 @@ Server::Server(Logger& logger, EventBus& eventBus)
     myfile.close();
     //Testing over
 
-    socket_ = new udp::socket(io_context, udp::endpoint(udp::v4(), 8853));
+    socket_ = new udp::socket(io_context_, udp::endpoint(udp::v4(), 8853));
 }
 
 Server::~Server() {
@@ -84,7 +84,7 @@ Server::~Server() {
 }
 
 void Server::run() {
-    io_context.run();
+    io_context_.run();
     do_receive();
 }
 
diff --git a/src/resolver/include/Server.hpp b/src/resolver/include/Server.hpp
index 6870aae..ba6a9ba 100644
--- a/src/resolver/include/Server.hpp
+++ b/src/resolver/include/Server.hpp
@@ -15,12 +15,13 @@ using Core::Logger;
 class Server
 {
     private:
-    EventBus& eventBus;
-    Logger& logger;
-    asio::io_context io_context;
+    EventBus& eventBus_;
+    Logger& logger_;
+    asio::io_context io_context_;
     asio::ip::udp::socket* socket_;
     asio::ip::udp::endpoint sender_endpoint_;
     char data_[1024];
+
     void do_receive();
     void do_send(std::size_t length);