diff --git a/include/multiaddr/multiaddr.h b/include/multiaddr/multiaddr.h
index 9b04a3b..72c5659 100644
--- a/include/multiaddr/multiaddr.h
+++ b/include/multiaddr/multiaddr.h
@@ -7,7 +7,7 @@
 #include "protocols.h"
 #include "protoutils.h"
 
-struct maddr
+struct MultiAddress
 {
 	char string[800];
 	uint8_t bytes[400];
@@ -17,14 +17,14 @@ struct maddr
 
 int strpos(char *haystack, char *needle);
 
-struct maddr* new_maddr_fb(uint8_t * byteaddress,int size); //Construct new address from bytes
+struct MultiAddress* new_maddr_fb(uint8_t * byteaddress,int size); //Construct new address from bytes
 
-struct maddr* new_maddr_fs(char * straddress); //Construct new address from string
+struct MultiAddress* new_maddr_fs(char * straddress); //Construct new address from string
 
-void maddr_free(struct maddr* in);
+void maddr_free(struct MultiAddress* in);
 
-int m_encapsulate(struct maddr * result, char * string);
+int m_encapsulate(struct MultiAddress * result, char * string);
 
-int m_decapsulate(struct maddr * result, char * srci);
+int m_decapsulate(struct MultiAddress * result, char * srci);
 
 #endif
diff --git a/multiaddr.c b/multiaddr.c
index a5798c2..4d27f17 100644
--- a/multiaddr.c
+++ b/multiaddr.c
@@ -18,9 +18,9 @@ int strpos(char *haystack, char *needle)
 	}
 }
 
-struct maddr* new_maddr_fb(uint8_t* byteaddress,int size)//Construct new address from bytes
+struct MultiAddress* new_maddr_fb(uint8_t* byteaddress,int size)//Construct new address from bytes
 {
-	struct maddr* anewaddr2 = (struct maddr*)malloc(sizeof(struct maddr));
+	struct MultiAddress* anewaddr2 = (struct MultiAddress*)malloc(sizeof(struct MultiAddress));
 	if (anewaddr2 != NULL) {
 		if(byteaddress!=NULL)
 		{
@@ -33,9 +33,9 @@ struct maddr* new_maddr_fb(uint8_t* byteaddress,int size)//Construct new address
 	}
 	return anewaddr2;
 }
-struct maddr* new_maddr_fs(char * straddress)//Construct new address from string
+struct MultiAddress* new_maddr_fs(char * straddress)//Construct new address from string
 {
-	struct maddr* anewaddr = (struct maddr*)malloc(sizeof(struct maddr));
+	struct MultiAddress* anewaddr = (struct MultiAddress*)malloc(sizeof(struct MultiAddress));
 	if (anewaddr != NULL) {
 		bzero(anewaddr->string, 800);
 		strcpy(anewaddr->string, straddress);
@@ -54,11 +54,11 @@ struct maddr* new_maddr_fs(char * straddress)//Construct new address from string
 	return anewaddr;
 }
 
-void maddr_free(struct maddr* in) {
+void maddr_free(struct MultiAddress* in) {
 	free(in);
 }
 
-int m_encapsulate(struct maddr * result, char * string)
+int m_encapsulate(struct MultiAddress * result, char * string)
 {
 	if(result!=NULL&&string!=NULL)
 	{
@@ -82,7 +82,7 @@ int m_encapsulate(struct maddr * result, char * string)
 		return 0;
 	}
 }
-int m_decapsulate(struct maddr * result, char * srci)
+int m_decapsulate(struct MultiAddress * result, char * srci)
 {
 	if(result!=NULL && srci!=NULL)
 	{
diff --git a/testing.c b/testing.c
index 25e5774..40b9112 100644
--- a/testing.c
+++ b/testing.c
@@ -7,7 +7,7 @@ int main()
 	bzero(addrstr,100);
 	strcat(addrstr,"/ip4/192.168.1.1/tcp/8080/");
 	printf("INITIAL: %s\n",addrstr);
-	struct maddr* a;
+	struct MultiAddress* a;
 	a=new_maddr_fs(addrstr);
 	printf("TEST BYTES: %s\n",Var_To_Hex(a->bsize[0], a->bytes));
 	
@@ -23,7 +23,7 @@ int main()
 	m_encapsulate(a,"/tcp/8080");
 	printf("A STRING ENCAPSULATED TCP:%s\n",a->string);
 
-	struct maddr* beta;
+	struct MultiAddress* beta;
 	beta=new_maddr_fb(a->bytes,a->bsize[0]);
 	printf("B STRING: %s\n",beta->string);