Index: NetFlow9Processor.cpp
===================================================================
--- NetFlow9Processor.cpp	(revision ba485ca2d8c33910626c5e6cb3f31a8596798a1a)
+++ NetFlow9Processor.cpp	(revision 13ab381e2080f347f08a9bf9a12804a1df8098af)
@@ -1,14 +1,14 @@
 #include "NetFlow9Processor.h"
 
-unsigned int NetFlow9Processor::ByteTouInt32(unsigned char b[], int base) {
+unsigned int NetFlow9Processor::ByteTouInt32(unsigned char bytes[], int base) {
 	//TODO: Check for out of range muppets
 	//TODO: Endianess issues?
-	return (b[base] << 24) + (b[base+1] << 16) + (b[base+2] << 8) + b[base+3];
+	return (bytes[base] << 24) + (bytes[base+1] << 16) + (bytes[base+2] << 8) + bytes[base+3];
 }
 
-unsigned short NetFlow9Processor::ByteTouInt16(unsigned char b[], int base) {
+unsigned short NetFlow9Processor::ByteTouInt16(unsigned char bytes[], int base) {
 	//TODO: Check for out of range muppets
 	//TODO: Endianess issues?
-	return (b[base] << 8) + b[base+1];
+	return (bytes[base] << 8) + bytes[base+1];
 }
 
@@ -30,5 +30,5 @@
 }
 
-int NetFlow9Processor::ProcessPacket(unsigned char b[], int l, FlowSet* processedFlowSet) {
+int NetFlow9Processor::ProcessPacket(unsigned char buffer[], int bufferLength, FlowSet* processedFlowSet) {
 
 	int nextIndex = 0;					// Next byte in the buffer
@@ -42,5 +42,5 @@
 	unsigned int sourceID = 0;			// Locally significant source ID
 
-	if ( l < 24) {
+	if ( bufferLength < 24) {
 		//Packet is too short to contain a header
 		return 254;
@@ -48,5 +48,5 @@
 	
 	//First 2 bytes (0 and 1) are the version
-	version = (b[0] << 8 ) + b [1];
+	version = (buffer[0] << 8 ) + buffer [1];
 	if (version != 9) {
 			//Not a NetFlow v9 packet
@@ -55,5 +55,5 @@
 
 	//Bytes 2 and 3 are the count of records in the packet
-	count = (b[2] << 8 ) + b [3];
+	count = (buffer[2] << 8 ) + buffer [3];
 
 	if (count < 1) {
@@ -63,17 +63,17 @@
 
 	nextIndex = 4;
-	uptime = ByteTouInt32(b,nextIndex);
+	uptime = ByteTouInt32(buffer,nextIndex);
 	nextIndex += 4;
-	packetTime = ByteTouInt32(b,nextIndex);
+	packetTime = ByteTouInt32(buffer,nextIndex);
 	nextIndex += 4;
-	sequenceID = ByteTouInt32(b,nextIndex);
+	sequenceID = ByteTouInt32(buffer,nextIndex);
 	nextIndex += 4;
-	sourceID = ByteTouInt32(b,nextIndex);
+	sourceID = ByteTouInt32(buffer,nextIndex);
 	nextIndex += 4;
 
 	do {
-		flowSetID = ByteTouInt16(b,nextIndex);
-		flowSetLength = ByteTouInt16(b,nextIndex+2);
-		if (nextIndex + flowSetLength > l) {
+		flowSetID = ByteTouInt16(buffer,nextIndex);
+		flowSetLength = ByteTouInt16(buffer,nextIndex+2);
+		if (nextIndex + flowSetLength > bufferLength) {
 			//Invalid/unsupported packet
 			return 251;
@@ -82,10 +82,10 @@
 			//DATA FlowSet
 			printf("  -> Found data flowSetID %d, length %d.\n", flowSetID, flowSetLength);
-			processDataFlowSet(b,nextIndex,flowSetID,flowSetLength);
+			processDataFlowSet(buffer,nextIndex,flowSetID,flowSetLength);
 		}
 		else if (flowSetID == 0) {
 			//TEMPLATE FlowSet
 			printf("  -> Found template flowSetID %d, length %d.\n", flowSetID, flowSetLength);
-			processTemplateFlowSet(b,nextIndex,flowSetLength);
+			processTemplateFlowSet(buffer,nextIndex,flowSetLength);
 		}
 		else if (flowSetID == 1) {
@@ -99,10 +99,10 @@
 		nextIndex += flowSetLength;
 	}
-	while ( nextIndex < l);
+	while ( nextIndex < bufferLength);
 
 	return sequenceID;
 }
 
-void NetFlow9Processor::processDataFlowSet(unsigned char b[], int startIndex, unsigned short flowSetID, unsigned short flowSetLength) {
+void NetFlow9Processor::processDataFlowSet(unsigned char buffer[], int startIndex, unsigned short flowSetID, unsigned short flowSetLength) {
 	int nextIndex = startIndex + 4;             // Next place to look (skip 4 header bytes already parsed)
 	int endIndex = startIndex + flowSetLength ; // End the loop at the end of the template
@@ -128,5 +128,5 @@
 	while ( nextIndex < endIndex );
 }
-void NetFlow9Processor::processTemplateFlowSet(unsigned char b[], int startIndex, unsigned short flowSetLength) {
+void NetFlow9Processor::processTemplateFlowSet(unsigned char buffer[], int startIndex, unsigned short flowSetLength) {
 
 	int nextIndex = startIndex + 4;				// Next place to look (skip 4 header bytes already parsed)
@@ -141,6 +141,6 @@
 
 		//Lets get the Template ID and the count of fields
-		id = ByteTouInt16(b,nextIndex);
-		count = ByteTouInt16(b,nextIndex+2);
+		id = ByteTouInt16(buffer,nextIndex);
+		count = ByteTouInt16(buffer,nextIndex+2);
 
 		printf("  -> Template ID %d\n", id);
@@ -154,6 +154,6 @@
 
 		for (i=0; i < count; i++) {
-			field.code = ByteTouInt16(b,nextIndex);
-			field.length = ByteTouInt16(b,nextIndex+2);
+			field.code = ByteTouInt16(buffer,nextIndex);
+			field.length = ByteTouInt16(buffer,nextIndex+2);
 			printf("    -> Field %d. Field Code %d, length %d\n", i, field.code, field.length );
 			dataTemplate->Fields.push_back( field );
Index: NetFlow9Processor.h
===================================================================
--- NetFlow9Processor.h	(revision ba485ca2d8c33910626c5e6cb3f31a8596798a1a)
+++ NetFlow9Processor.h	(revision 13ab381e2080f347f08a9bf9a12804a1df8098af)
@@ -16,5 +16,5 @@
 
 		NetFlow9Processor(struct sockaddr *remaddr, socklen_t *addrlen);
-		int ProcessPacket(unsigned char b[], int l, FlowSet* processedFlowSet);
+		int ProcessPacket(unsigned char buffer[], int bufferLength, FlowSet* processedFlowSet);
 
 
@@ -26,8 +26,8 @@
 //		NetFlowDataTemplate::DataTemplateItem_t *strtest;
 
-		unsigned int ByteTouInt32(unsigned char b[], int base);
-		unsigned short ByteTouInt16(unsigned char b[], int base);
-		void processDataFlowSet(unsigned char b[], int nextIndex, unsigned short flowSetID, unsigned short flowSetLength);
-		void processTemplateFlowSet(unsigned char b[], int nextIndex, unsigned short flowSetLength);
+		unsigned int ByteTouInt32(unsigned char bytes[], int base);
+		unsigned short ByteTouInt16(unsigned char bytes[], int base);
+		void processDataFlowSet(unsigned char buffer[], int nextIndex, unsigned short flowSetID, unsigned short flowSetLength);
+		void processTemplateFlowSet(unsigned char buffer[], int nextIndex, unsigned short flowSetLength);
 
 
Index: NetFlowDataTemplate.cpp
===================================================================
--- NetFlowDataTemplate.cpp	(revision ba485ca2d8c33910626c5e6cb3f31a8596798a1a)
+++ NetFlowDataTemplate.cpp	(revision 13ab381e2080f347f08a9bf9a12804a1df8098af)
@@ -1,6 +1,6 @@
 #include "NetFlowDataTemplate.h"
 
-NetFlowDataTemplate::NetFlowDataTemplate(unsigned short i, unsigned short c) {
-	id = i;
-	count = c;
+NetFlowDataTemplate::NetFlowDataTemplate(unsigned short templateID, unsigned short fieldCount) {
+	_id = templateID;
+	_count = fieldCount;
 }
Index: NetFlowDataTemplate.h
===================================================================
--- NetFlowDataTemplate.h	(revision ba485ca2d8c33910626c5e6cb3f31a8596798a1a)
+++ NetFlowDataTemplate.h	(revision 13ab381e2080f347f08a9bf9a12804a1df8098af)
@@ -18,5 +18,5 @@
 
 	//Constructor (id, length)
-	NetFlowDataTemplate(unsigned short, unsigned short);
+	NetFlowDataTemplate(unsigned short templateID, unsigned short fieldCount);
 	
 
@@ -24,6 +24,6 @@
 	private:
 	
-	unsigned short id;
-	unsigned short count;
+	unsigned short _id;
+	unsigned short _count;
 
 };
Index: NetFlowDataTemplateCache.cpp
===================================================================
--- NetFlowDataTemplateCache.cpp	(revision ba485ca2d8c33910626c5e6cb3f31a8596798a1a)
+++ NetFlowDataTemplateCache.cpp	(revision 13ab381e2080f347f08a9bf9a12804a1df8098af)
@@ -4,28 +4,28 @@
 }
 
-bool NetFlowDataTemplateCache::AddDataTemplate (unsigned short id, NetFlowDataTemplate* dataTemplate) {
+bool NetFlowDataTemplateCache::AddDataTemplate (unsigned short templateID, NetFlowDataTemplate* dataTemplate) {
 	NetFlowDataTemplate *test;
-	printf("    -> Adding DataTemplate ID %d.\n", id);
+	printf("    -> Adding DataTemplate ID %d.\n", templateID);
 	try {
-		printf("      -> Trying to fetch %d.\n", id);
-		test = Cache.at(id);
+		printf("      -> Trying to fetch %d.\n", templateID);
+		test = _Cache.at(templateID);
 	}
 	catch (const std::out_of_range oor) {
 		//Out of range --> Not in Cache - Great!
 		printf("      -> Not found - adding.\n");
-		Cache[id] = dataTemplate;
+		_Cache[templateID] = dataTemplate;
 		return true;
 	}
 	//Uh-oh - this ID is already in the cache
-	printf("      -> Already in the cache - fail.\n", id);
+	printf("      -> Already in the cache - fail.\n", templateID);
 	return 0;
 }
 
-bool NetFlowDataTemplateCache::ExistsDataTemplate (unsigned short id) {
+bool NetFlowDataTemplateCache::ExistsDataTemplate (unsigned short templateID) {
 	NetFlowDataTemplate *test;
-	printf("    -> Checking for DataTemplate ID %d.\n", id);
+	printf("    -> Checking for DataTemplate ID %d.\n", templateID);
 	try {
-		printf("      -> Trying to fetch %d.\n", id);
-		test = Cache.at(id);
+		printf("      -> Trying to fetch %d.\n", templateID);
+		test = _Cache.at(templateID);
 	}
 	catch (const std::out_of_range oor) {
@@ -38,10 +38,10 @@
 }
 
-NetFlowDataTemplate* NetFlowDataTemplateCache::GetDataTemplate (unsigned short id) {
+NetFlowDataTemplate* NetFlowDataTemplateCache::GetDataTemplate (unsigned short templateID) {
 	NetFlowDataTemplate *dataTemplate;
-	printf("    -> Getting DataTemplate ID %d.\n", id);
+	printf("    -> Getting DataTemplate ID %d.\n", templateID);
 	try {
-		printf("      -> Trying to fetch %d.\n", id);
-		dataTemplate = Cache.at(id);
+		printf("      -> Trying to fetch %d.\n", templateID);
+		dataTemplate = _Cache.at(templateID);
 	}
 	catch (const std::out_of_range oor) {
@@ -54,11 +54,11 @@
 }
 
-NetFlowDataTemplate* NetFlowDataTemplateCache::DeleteDataTemplate (unsigned short id) {
+NetFlowDataTemplate* NetFlowDataTemplateCache::DeleteDataTemplate (unsigned short templateID) {
 	NetFlowDataTemplate *dataTemplate;
-	printf("    -> Deleting DataTemplate ID %d.\n", id);
+	printf("    -> Deleting DataTemplate ID %d.\n", templateID);
 	try {
-		printf("      -> Trying to fetch %d.\n", id);
-		dataTemplate = Cache.at(id);
-		Cache.erase(id);
+		printf("      -> Trying to fetch %d.\n", templateID);
+		dataTemplate = _Cache.at(templateID);
+		_Cache.erase(templateID);
 	}
 	catch (const std::out_of_range oor) {
Index: NetFlowDataTemplateCache.h
===================================================================
--- NetFlowDataTemplateCache.h	(revision ba485ca2d8c33910626c5e6cb3f31a8596798a1a)
+++ NetFlowDataTemplateCache.h	(revision 13ab381e2080f347f08a9bf9a12804a1df8098af)
@@ -13,12 +13,12 @@
 
 		NetFlowDataTemplateCache(void);
-		bool AddDataTemplate(unsigned short id, NetFlowDataTemplate*);
-		bool ExistsDataTemplate(unsigned short id);
-		NetFlowDataTemplate* DeleteDataTemplate(unsigned short id);
-		NetFlowDataTemplate* GetDataTemplate(unsigned short id);
+		bool AddDataTemplate(unsigned short templateID, NetFlowDataTemplate*);
+		bool ExistsDataTemplate(unsigned short templateID);
+		NetFlowDataTemplate* DeleteDataTemplate(unsigned short templateID);
+		NetFlowDataTemplate* GetDataTemplate(unsigned short templateID);
 
 
 	private:
-		std::map<unsigned short, NetFlowDataTemplate*> Cache;
+		std::map<unsigned short, NetFlowDataTemplate*> _Cache;
 
 
Index: NetSlow.vcxproj
===================================================================
--- NetSlow.vcxproj	(revision ba485ca2d8c33910626c5e6cb3f31a8596798a1a)
+++ NetSlow.vcxproj	(revision 13ab381e2080f347f08a9bf9a12804a1df8098af)
@@ -62,5 +62,5 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>C:\Users\Ian\source\include\x86_64-linux-gnu;C:\Users\Ian\source\include;$(IncludePath)</IncludePath>
+    <IncludePath>,,\include\x86_64-linux-gnu;..\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemGroup>
@@ -81,4 +81,5 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include=".gitignore" />
     <None Include="Makefile" />
   </ItemGroup>