diff --git a/catalogue/CMakeLists.txt b/catalogue/CMakeLists.txt
index 6b697726a1eed00e749fef7c761d4e9660d263ed..43cf8af1d246b5b707c51049a72f554bed52183c 100644
--- a/catalogue/CMakeLists.txt
+++ b/catalogue/CMakeLists.txt
@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 2.6)
 set (CATALOGUE_LIB_SRC_FILES
   Catalogue.cpp
   DummyCatalogue.cpp
-  SQLiteDatabase.cpp)
+  SqliteDatabase.cpp)
 
 add_library (ctacatalogue
   ${CATALOGUE_LIB_SRC_FILES})
diff --git a/catalogue/SQLiteDatabase.cpp b/catalogue/SqliteDatabase.cpp
similarity index 85%
rename from catalogue/SQLiteDatabase.cpp
rename to catalogue/SqliteDatabase.cpp
index ad85c60202829f759ab00dd6167bc8e277bddc41..d9c93f90ccd1c885d50432787ec5983b590136e5 100644
--- a/catalogue/SQLiteDatabase.cpp
+++ b/catalogue/SqliteDatabase.cpp
@@ -16,18 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "catalogue/SQLiteDatabase.hpp"
+#include "catalogue/SqliteDatabase.hpp"
 #include "common/exception/Exception.hpp"
 
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::catalogue::SQLiteDatabase::SQLiteDatabase(const std::string &filename) {
+cta::catalogue::SqliteDatabase::SqliteDatabase(const std::string &filename) {
   m_dbHandle = NULL;
   if(sqlite3_open(filename.c_str(), &m_dbHandle)) {
     sqlite3_close(m_dbHandle);
     exception::Exception ex;
-    ex.getMessage() << "Failed to construct SQLiteDatabase: sqlite3_open failed"
+    ex.getMessage() << "Failed to construct SqliteDatabase: sqlite3_open failed"
       ": " << sqlite3_errmsg(m_dbHandle);
     throw(ex);
   }
@@ -36,13 +36,13 @@ cta::catalogue::SQLiteDatabase::SQLiteDatabase(const std::string &filename) {
 //------------------------------------------------------------------------------
 // destructor
 //------------------------------------------------------------------------------
-cta::catalogue::SQLiteDatabase::~SQLiteDatabase() {
+cta::catalogue::SqliteDatabase::~SqliteDatabase() {
   sqlite3_close(m_dbHandle);
 }
 
 //------------------------------------------------------------------------------
 // getHandle
 //------------------------------------------------------------------------------
-sqlite3 *cta::catalogue::SQLiteDatabase::getHandle() {
+sqlite3 *cta::catalogue::SqliteDatabase::getHandle() {
   return m_dbHandle;
 }
diff --git a/catalogue/SQLiteDatabase.hpp b/catalogue/SqliteDatabase.hpp
similarity index 91%
rename from catalogue/SQLiteDatabase.hpp
rename to catalogue/SqliteDatabase.hpp
index a72676626febfa8c16af293ca20668e6ac094bcd..f8a016aa4b42926c7d88e3e3f51c8688121e727b 100644
--- a/catalogue/SQLiteDatabase.hpp
+++ b/catalogue/SqliteDatabase.hpp
@@ -27,7 +27,7 @@ namespace catalogue {
 /**
  * A C++ wrapper around an SQLite database handle.
  */
-class SQLiteDatabase {
+class SqliteDatabase {
 public:
 
   /**
@@ -35,12 +35,12 @@ public:
    *
    * @param filename The filename to be passed to the sqlit3_open() function.
    */
-  SQLiteDatabase(const std::string &filename);
+  SqliteDatabase(const std::string &filename);
 
   /**
    * Destructor.
    */
-  ~SQLiteDatabase();
+  ~SqliteDatabase();
 
   /**
    * Returns the underlying database handle.
@@ -52,7 +52,7 @@ public:
 private:
 
   /**
-   * SQLite database handle.
+   * The database handle.
    */
   sqlite3 *m_dbHandle;