diff --git a/src/a.out b/src/a.out
deleted file mode 100755
index d8b53810..00000000
Binary files a/src/a.out and /dev/null differ
diff --git a/src/mad.h b/src/marian.h
similarity index 98%
rename from src/mad.h
rename to src/marian.h
index 79257ab7..4a14e340 100644
--- a/src/mad.h
+++ b/src/marian.h
@@ -7,7 +7,7 @@
 
 #include <boost/pool/pool.hpp>
 
-namespace mad {
+namespace marian {
 
 typedef float Tensor; // Now do this for cuDNN tensors!
 struct Chainable;
@@ -82,7 +82,7 @@ class Var {
     }
     
     void calc_gradients() {
-      mad::grad(vimpl_);
+      marian::grad(vimpl_);
     }
     
   private:
diff --git a/src/test.cpp b/src/test.cpp
index 2d7a05f4..bf877057 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -1,11 +1,11 @@
 #include <iostream>
 #include <ctime>
 
-#include "mad.h"
+#include "marian.h"
 
-mad::Var layer(size_t max) {
+marian::Var layer(size_t max) {
     
-    using namespace mad;
+    using namespace marian;
     
     Var x0 = 1, x1 = 2, x2 = 3;
     Var y = 0.0;
@@ -23,7 +23,7 @@ mad::Var layer(size_t max) {
 int main(int argc, char** argv) {
     srand(time(NULL));
     
-    using namespace mad;
+    using namespace marian;
     
     Var y1 = layer(10);
     Var y2 = layer(5);