diff --git a/octastd/new.h b/octa/new.h
similarity index 93%
rename from octastd/new.h
rename to octa/new.h
index bd9c588..a1bf9cd 100644
--- a/octastd/new.h
+++ b/octa/new.h
@@ -3,8 +3,8 @@
  * This file is part of OctaSTD. See COPYING.txt for futher information.
  */
 
-#ifndef OCTASTD_NEW_H
-#define OCTASTD_NEW_H
+#ifndef OCTA_NEW_H
+#define OCTA_NEW_H
 
 #include <stdlib.h>
 
diff --git a/octastd/vector.h b/octa/vector.h
similarity index 84%
rename from octastd/vector.h
rename to octa/vector.h
index b26dd85..8a3a998 100644
--- a/octastd/vector.h
+++ b/octa/vector.h
@@ -3,12 +3,12 @@
  * This file is part of OctaSTD. See COPYING.txt for futher information.
  */
 
-#ifndef OCTASTD_VECTOR_H
-#define OCTASTD_VECTOR_H
+#ifndef OCTA_VECTOR_H
+#define OCTA_VECTOR_H
 
-#include <octastd/new.h>
+#include <octa/new.h>
 
-namespace octastd {
+namespace octa {
     template<typename T>
     class vector {
         T *buf;