diff --git a/libs/evoral/SConscript b/libs/evoral/SConscript
index f07c2052b2..7aeac5a224 100644
--- a/libs/evoral/SConscript
+++ b/libs/evoral/SConscript
@@ -31,9 +31,9 @@ src/ControlList.cpp
 src/ControlSet.cpp
 src/Curve.cpp
 src/Event.cpp
-src/LibSMF.cpp
 src/MIDIEvent.cpp
 src/Note.cpp
+src/SMF.cpp
 src/SMFReader.cpp
 src/Sequence.cpp
 """)
diff --git a/libs/evoral/evoral/OldSMF.hpp b/libs/evoral/evoral/OldSMF.hpp
index e9f2f47bfe..9e204be82e 100644
--- a/libs/evoral/evoral/OldSMF.hpp
+++ b/libs/evoral/evoral/OldSMF.hpp
@@ -16,8 +16,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef EVORAL_SMF_HPP
-#define EVORAL_SMF_HPP
+#ifndef EVORAL_OLD_SMF_HPP
+#define EVORAL_OLD_SMF_HPP
 
 #include "evoral/MIDIFile.hpp"
 
@@ -80,5 +80,5 @@ private:
 
 }; /* namespace Evoral */
 
-#endif /* EVORAL_SMF_HPP */
+#endif /* EVORAL_OLD_SMF_HPP */
 
diff --git a/libs/evoral/evoral/LibSMF.hpp b/libs/evoral/evoral/SMF.hpp
similarity index 90%
rename from libs/evoral/evoral/LibSMF.hpp
rename to libs/evoral/evoral/SMF.hpp
index aa339e2e24..be1ed667cc 100644
--- a/libs/evoral/evoral/LibSMF.hpp
+++ b/libs/evoral/evoral/SMF.hpp
@@ -17,8 +17,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef EVORAL_LIB_SMF_HPP
-#define EVORAL_LIB_SMF_HPP
+#ifndef EVORAL_SMF_HPP
+#define EVORAL_SMF_HPP
 
 #include <cassert>
 #include "evoral/MIDIFile.hpp"
@@ -36,10 +36,10 @@ template<typename Time> class EventRingBuffer;
 /** Standard Midi File (Type 0)
  */
 template<typename Time>
-class LibSMF : public MIDIFile<Time> {
+class SMF : public MIDIFile<Time> {
 public:
-	LibSMF() : _last_ev_time(0), _smf(0), _smf_track(0), _empty(true) {};
-	virtual ~LibSMF();
+	SMF() : _last_ev_time(0), _smf(0), _smf_track(0), _empty(true) {};
+	virtual ~SMF();
 
 	void seek_to_start() const;
 	
@@ -77,5 +77,5 @@ private:
 
 }; /* namespace Evoral */
 
-#endif /* EVORAL_LIB_SMF_HPP */
+#endif /* EVORAL_SMF_HPP */
 
diff --git a/libs/evoral/src/LibSMF.cpp b/libs/evoral/src/SMF.cpp
similarity index 90%
rename from libs/evoral/src/LibSMF.cpp
rename to libs/evoral/src/SMF.cpp
index 2aa64b27d6..b0f5a86495 100644
--- a/libs/evoral/src/LibSMF.cpp
+++ b/libs/evoral/src/SMF.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <iostream>
 #include "evoral/Event.hpp"
-#include "evoral/LibSMF.hpp"
+#include "evoral/SMF.hpp"
 #include "libsmf/smf.h"
 
 using namespace std;
@@ -28,7 +28,7 @@ using namespace std;
 namespace Evoral {
 
 template<typename Time>
-LibSMF<Time>::~LibSMF()
+SMF<Time>::~SMF()
 {	
 	if (_smf) {
 		smf_delete(_smf);
@@ -46,7 +46,7 @@ LibSMF<Time>::~LibSMF()
  */
 template<typename Time>
 int
-LibSMF<Time>::open(const std::string& path) THROW_FILE_ERROR
+SMF<Time>::open(const std::string& path) THROW_FILE_ERROR
 {
 	if (_smf) { 
 		smf_delete(_smf);
@@ -84,7 +84,7 @@ LibSMF<Time>::open(const std::string& path) THROW_FILE_ERROR
 
 template<typename Time>
 void
-LibSMF<Time>::close() THROW_FILE_ERROR
+SMF<Time>::close() THROW_FILE_ERROR
 {
 	if (_smf) {
 		if (smf_save(_smf, _path.c_str()) != 0) {
@@ -98,7 +98,7 @@ LibSMF<Time>::close() THROW_FILE_ERROR
 
 template<typename Time>
 void
-LibSMF<Time>::seek_to_start() const
+SMF<Time>::seek_to_start() const
 {
 	smf_rewind(_smf);
 }
@@ -119,7 +119,7 @@ LibSMF<Time>::seek_to_start() const
  */
 template<typename Time>
 int
-LibSMF<Time>::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const
+SMF<Time>::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const
 {
 	smf_event_t *event;
 	
@@ -151,7 +151,7 @@ LibSMF<Time>::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const
 
 template<typename Time>
 void
-LibSMF<Time>::append_event_delta(uint32_t delta_t, const Event<Time>& ev)
+SMF<Time>::append_event_delta(uint32_t delta_t, const Event<Time>& ev)
 {
 	assert(ev.size() > 0);
 	
@@ -173,7 +173,7 @@ LibSMF<Time>::append_event_delta(uint32_t delta_t, const Event<Time>& ev)
 
 template<typename Time>
 void
-LibSMF<Time>::begin_write()
+SMF<Time>::begin_write()
 {
 	assert(_smf_track);
 	smf_track_delete(_smf_track);
@@ -189,12 +189,12 @@ LibSMF<Time>::begin_write()
 
 template<typename Time>
 void
-LibSMF<Time>::end_write() THROW_FILE_ERROR
+SMF<Time>::end_write() THROW_FILE_ERROR
 {
 	if (smf_save(_smf, _path.c_str()) != 0)
 		throw typename MIDIFile<Time>::FileError();
 }
 
-template class LibSMF<double>;
+template class SMF<double>;
 
 } // namespace Evoral
diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.hpp
index e4d390a07f..0f2fcf89fb 100644
--- a/libs/evoral/test/SMFTest.hpp
+++ b/libs/evoral/test/SMFTest.hpp
@@ -1,67 +1,79 @@
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-
-#include <evoral/LibSMF.hpp>
-
-#include "SequenceTest.hpp"
-
-#include <sigc++/sigc++.h>
+/* This file is part of Evoral.
+ * Copyright(C) 2000-2008 Paul Davis
+ * Author: Hans Baier
+ * 
+ * Evoral is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or(at your option) any later
+ * version.
+ * 
+ * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 #include <cassert>
+#include <sigc++/sigc++.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include "evoral/SMF.hpp"
+#include "SequenceTest.hpp"
 
 using namespace Evoral;
 
 template<typename Time>
-class TestSMF : public LibSMF<Time> {
+class TestSMF : public SMF<Time> {
 public:
 	std::string path() const { return _path; }
 	
 	int open(const std::string& path) THROW_FILE_ERROR {
 		_path = path;
-		return LibSMF<Time>::open(path);
+		return SMF<Time>::open(path);
 	}
 	
 	void close() THROW_FILE_ERROR {
-		return LibSMF<Time>::close();
+		return SMF<Time>::close();
 	}
 	
 	int read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const {
-		return LibSMF<Time>::read_event(delta_t, size, buf);
+		return SMF<Time>::read_event(delta_t, size, buf);
 	}
 
 private:
-	
 	std::string  _path;
-	
 };
 
 class SMFTest : public CppUnit::TestFixture
 {
-    CPPUNIT_TEST_SUITE (SMFTest);
-    CPPUNIT_TEST (createNewFileTest);
-    CPPUNIT_TEST (takeFiveTest);
-    CPPUNIT_TEST_SUITE_END ();
+    CPPUNIT_TEST_SUITE(SMFTest);
+    CPPUNIT_TEST(createNewFileTest);
+    CPPUNIT_TEST(takeFiveTest);
+    CPPUNIT_TEST_SUITE_END();
 
     public:
-    
     	typedef double Time;
        	
-        void setUp (void) { 
+        void setUp() { 
            type_map = new DummyTypeMap();
            assert(type_map);
            seq = new MySequence<Time>(*type_map, 0);
            assert(seq);
         }
         
-        void tearDown (void) {
+        void tearDown() {
         	delete seq;
         	delete type_map;
         }
 
-        void createNewFileTest(void);
-        void takeFiveTest (void);
+        void createNewFileTest();
+        void takeFiveTest();
 
     private:
-       	DummyTypeMap*       type_map;
-       	MySequence<Time>*   seq;
+       	DummyTypeMap*     type_map;
+       	MySequence<Time>* seq;
 };
+
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 1e0df3e655..54120cdd5e 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -67,9 +67,9 @@ def build(bld):
 		src/ControlSet.cpp
 		src/Curve.cpp
 		src/Event.cpp
-		src/LibSMF.cpp
 		src/MIDIEvent.cpp
 		src/Note.cpp
+		src/SMF.cpp
 		src/Sequence.cpp
 	'''
 	obj.export_incdirs = ['.']