diff --git a/src/choosetableform.cpp b/src/ChooseTableForm.cpp
similarity index 96%
rename from src/choosetableform.cpp
rename to src/ChooseTableForm.cpp
index 2d2f88d9..2fd1eb89 100644
--- a/src/choosetableform.cpp
+++ b/src/ChooseTableForm.cpp
@@ -1,4 +1,4 @@
-#include "choosetableform.h"
+#include "ChooseTableForm.h"
 
 /*
  *  Constructs a chooseTableForm as a child of 'parent', with the
diff --git a/src/choosetableform.h b/src/ChooseTableForm.h
similarity index 100%
rename from src/choosetableform.h
rename to src/ChooseTableForm.h
diff --git a/src/createindexform.cpp b/src/CreateIndexForm.cpp
similarity index 99%
rename from src/createindexform.cpp
rename to src/CreateIndexForm.cpp
index fe296493..66afa381 100644
--- a/src/createindexform.cpp
+++ b/src/CreateIndexForm.cpp
@@ -1,4 +1,4 @@
-#include "createindexform.h"
+#include "CreateIndexForm.h"
 #include <QMessageBox>
 /*
  *  Constructs a createIndexForm as a child of 'parent', with the
diff --git a/src/createindexform.h b/src/CreateIndexForm.h
similarity index 100%
rename from src/createindexform.h
rename to src/CreateIndexForm.h
diff --git a/src/deleteindexform.cpp b/src/DeleteIndexForm.cpp
similarity index 97%
rename from src/deleteindexform.cpp
rename to src/DeleteIndexForm.cpp
index ed1b7005..54b698d2 100644
--- a/src/deleteindexform.cpp
+++ b/src/DeleteIndexForm.cpp
@@ -1,4 +1,4 @@
-#include "deleteindexform.h"
+#include "DeleteIndexForm.h"
 #include <QMessageBox>
 /*
  *  Constructs a deleteIndexForm as a child of 'parent', with the
diff --git a/src/deleteindexform.h b/src/DeleteIndexForm.h
similarity index 100%
rename from src/deleteindexform.h
rename to src/DeleteIndexForm.h
diff --git a/src/deletetableform.cpp b/src/DeleteTableForm.cpp
similarity index 97%
rename from src/deletetableform.cpp
rename to src/DeleteTableForm.cpp
index 3cfceeac..e68a20ba 100644
--- a/src/deletetableform.cpp
+++ b/src/DeleteTableForm.cpp
@@ -1,4 +1,4 @@
-#include "deletetableform.h"
+#include "DeleteTableForm.h"
 #include <QMessageBox>
 
 /*
diff --git a/src/deletetableform.h b/src/DeleteTableForm.h
similarity index 100%
rename from src/deletetableform.h
rename to src/DeleteTableForm.h
diff --git a/src/dialogabout.cpp b/src/DialogAbout.cpp
similarity index 90%
rename from src/dialogabout.cpp
rename to src/DialogAbout.cpp
index dbd05c0d..cf42d408 100644
--- a/src/dialogabout.cpp
+++ b/src/DialogAbout.cpp
@@ -1,5 +1,5 @@
-#include "dialogabout.h"
-#include "ui_dialogabout.h"
+#include "DialogAbout.h"
+#include "ui_DialogAbout.h"
 #include "sqlite_source/sqlite3.h"
 
 DialogAbout::DialogAbout(QWidget *parent) :
diff --git a/src/dialogabout.h b/src/DialogAbout.h
similarity index 100%
rename from src/dialogabout.h
rename to src/DialogAbout.h
diff --git a/src/dialogabout.ui b/src/DialogAbout.ui
similarity index 100%
rename from src/dialogabout.ui
rename to src/DialogAbout.ui
diff --git a/src/editfieldform.cpp b/src/EditFieldForm.cpp
similarity index 98%
rename from src/editfieldform.cpp
rename to src/EditFieldForm.cpp
index 98139ef2..07fb26a5 100644
--- a/src/editfieldform.cpp
+++ b/src/EditFieldForm.cpp
@@ -1,5 +1,5 @@
-#include "editfieldform.h"
-#include "ui_editfieldform.h"
+#include "EditFieldForm.h"
+#include "ui_EditFieldForm.h"
 #include "sqlitedb.h"
 #include <QPushButton>
 
diff --git a/src/editfieldform.h b/src/EditFieldForm.h
similarity index 100%
rename from src/editfieldform.h
rename to src/EditFieldForm.h
diff --git a/src/editfieldform.ui b/src/EditFieldForm.ui
similarity index 100%
rename from src/editfieldform.ui
rename to src/EditFieldForm.ui
diff --git a/src/editform.cpp b/src/EditForm.cpp
similarity index 99%
rename from src/editform.cpp
rename to src/EditForm.cpp
index 5a4e774f..77553eaf 100644
--- a/src/editform.cpp
+++ b/src/EditForm.cpp
@@ -1,4 +1,4 @@
-#include "editform.h"
+#include "EditForm.h"
 #include <QTextStream>
 #include <QMessageBox>
 #include <QFileDialog>
diff --git a/src/editform.h b/src/EditForm.h
similarity index 100%
rename from src/editform.h
rename to src/EditForm.h
diff --git a/src/edittableform.cpp b/src/EditTableForm.cpp
similarity index 99%
rename from src/edittableform.cpp
rename to src/EditTableForm.cpp
index 9517e892..3d1059ef 100644
--- a/src/edittableform.cpp
+++ b/src/EditTableForm.cpp
@@ -1,6 +1,6 @@
-#include "edittableform.h"
-#include "ui_edittableform.h"
-#include "editfieldform.h"
+#include "EditTableForm.h"
+#include "ui_EditTableForm.h"
+#include "EditFieldForm.h"
 #include <QMessageBox>
 #include <QPushButton>
 #include "sqlitedb.h"
diff --git a/src/edittableform.h b/src/EditTableForm.h
similarity index 100%
rename from src/edittableform.h
rename to src/EditTableForm.h
diff --git a/src/edittableform.ui b/src/EditTableForm.ui
similarity index 100%
rename from src/edittableform.ui
rename to src/EditTableForm.ui
diff --git a/src/exporttablecsvform.cpp b/src/ExportTableCSVForm.cpp
similarity index 96%
rename from src/exporttablecsvform.cpp
rename to src/ExportTableCSVForm.cpp
index 95c2384a..aed92844 100644
--- a/src/exporttablecsvform.cpp
+++ b/src/ExportTableCSVForm.cpp
@@ -1,4 +1,4 @@
-#include "exporttablecsvform.h"
+#include "ExportTableCSVForm.h"
 
 /*
  *  Constructs a exportTableCSVForm as a child of 'parent', with the
diff --git a/src/exporttablecsvform.h b/src/ExportTableCSVForm.h
similarity index 100%
rename from src/exporttablecsvform.h
rename to src/ExportTableCSVForm.h
diff --git a/src/findform.cpp b/src/FindForm.cpp
similarity index 98%
rename from src/findform.cpp
rename to src/FindForm.cpp
index 84d04df1..f02634f7 100644
--- a/src/findform.cpp
+++ b/src/FindForm.cpp
@@ -1,4 +1,4 @@
-#include "findform.h"
+#include "FindForm.h"
 
 /*
  *  Constructs a findForm as a child of 'parent', with the
diff --git a/src/findform.h b/src/FindForm.h
similarity index 100%
rename from src/findform.h
rename to src/FindForm.h
diff --git a/src/importcsvform.cpp b/src/ImportCSVForm.cpp
similarity index 99%
rename from src/importcsvform.cpp
rename to src/ImportCSVForm.cpp
index cd021fd3..4bb5fad1 100644
--- a/src/importcsvform.cpp
+++ b/src/ImportCSVForm.cpp
@@ -1,4 +1,4 @@
-#include "importcsvform.h"
+#include "ImportCSVForm.h"
 #include <QMessageBox>
 #include <QProgressDialog>
 #include "sqlitedb.h"
diff --git a/src/importcsvform.h b/src/ImportCSVForm.h
similarity index 100%
rename from src/importcsvform.h
rename to src/ImportCSVForm.h
diff --git a/src/mainwindow.cpp b/src/MainWindow.cpp
similarity index 99%
rename from src/mainwindow.cpp
rename to src/MainWindow.cpp
index 56414e8c..b97b81b9 100644
--- a/src/mainwindow.cpp
+++ b/src/MainWindow.cpp
@@ -1,5 +1,5 @@
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
+#include "MainWindow.h"
+#include "ui_MainWindow.h"
 #include <QtGui/QFileDialog>
 #include <QSettings>
 #include <QFile>
@@ -11,20 +11,20 @@
 #include <QStandardItemModel>
 #include <QDragEnterEvent>
 #include <QScrollBar>
-#include "createindexform.h"
-#include "deletetableform.h"
-#include "deleteindexform.h"
-#include "dialogabout.h"
-#include "choosetableform.h"
-#include "edittableform.h"
-#include "editfieldform.h"
-#include "importcsvform.h"
-#include "exporttablecsvform.h"
-#include "preferencesform.h"
-#include "editform.h"
-#include "findform.h"
+#include "CreateIndexForm.h"
+#include "DeleteIndexForm.h"
+#include "DeleteTableForm.h"
+#include "DialogAbout.h"
+#include "ChooseTableForm.h"
+#include "EditTableForm.h"
+#include "EditFieldForm.h"
+#include "ImportCSVForm.h"
+#include "ExportTableCSVForm.h"
+#include "PreferencesForm.h"
+#include "EditForm.h"
+#include "FindForm.h"
 #include "SQLLogDock.h"
-#include "sqlitesyntaxhighlighter.h"
+#include "SQLiteSyntaxHighlighter.h"
 
 void MainWindow::setupUi()
 {
diff --git a/src/mainwindow.h b/src/MainWindow.h
similarity index 100%
rename from src/mainwindow.h
rename to src/MainWindow.h
diff --git a/src/mainwindow.ui b/src/MainWindow.ui
similarity index 100%
rename from src/mainwindow.ui
rename to src/MainWindow.ui
diff --git a/src/preferencesform.cpp b/src/PreferencesForm.cpp
similarity index 98%
rename from src/preferencesform.cpp
rename to src/PreferencesForm.cpp
index 2c06894b..bfc13eaf 100644
--- a/src/preferencesform.cpp
+++ b/src/PreferencesForm.cpp
@@ -1,5 +1,5 @@
-#include "preferencesform.h"
-#include "ui_preferencesform.h"
+#include "PreferencesForm.h"
+#include "ui_PreferencesForm.h"
 #include <QDir>
 #include <QSettings>
 #include <QFileDialog>
diff --git a/src/preferencesform.h b/src/PreferencesForm.h
similarity index 100%
rename from src/preferencesform.h
rename to src/PreferencesForm.h
diff --git a/src/preferencesform.ui b/src/PreferencesForm.ui
similarity index 100%
rename from src/preferencesform.ui
rename to src/PreferencesForm.ui
diff --git a/src/SQLLogDock.cpp b/src/SQLLogDock.cpp
index fda1f3e8..93b8b7a2 100644
--- a/src/SQLLogDock.cpp
+++ b/src/SQLLogDock.cpp
@@ -1,7 +1,7 @@
 #include "SQLLogDock.h"
 #include <QScrollBar>
 #include "sqlitedb.h"
-#include "sqlitesyntaxhighlighter.h"
+#include "SQLiteSyntaxHighlighter.h"
 
 /*
  *  Constructs a sqlLogForm as a child of 'parent', with the
diff --git a/src/sqlitesyntaxhighlighter.cpp b/src/SQLiteSyntaxHighlighter.cpp
similarity index 99%
rename from src/sqlitesyntaxhighlighter.cpp
rename to src/SQLiteSyntaxHighlighter.cpp
index 07177609..9ecac143 100644
--- a/src/sqlitesyntaxhighlighter.cpp
+++ b/src/SQLiteSyntaxHighlighter.cpp
@@ -1,4 +1,4 @@
-#include "sqlitesyntaxhighlighter.h"
+#include "SQLiteSyntaxHighlighter.h"
 
 SQLiteSyntaxHighlighter::SQLiteSyntaxHighlighter(QTextDocument *parent) :
     QSyntaxHighlighter(parent)
diff --git a/src/sqlitesyntaxhighlighter.h b/src/SQLiteSyntaxHighlighter.h
similarity index 100%
rename from src/sqlitesyntaxhighlighter.h
rename to src/SQLiteSyntaxHighlighter.h
diff --git a/src/browsermain.cpp b/src/main.cpp
similarity index 99%
rename from src/browsermain.cpp
rename to src/main.cpp
index 1b46c11c..21cebd9b 100644
--- a/src/browsermain.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-#include "mainwindow.h"
+#include "MainWindow.h"
 #include <QApplication>
 
 #if defined(Q_WS_MAC)
diff --git a/src/src.pro b/src/src.pro
index e10c95bf..134527f0 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -15,42 +15,42 @@ HEADERS += \
     sqlitedb.h \
     sqlbrowser_util.h \
     sqlite_source/sqlite3.h \
-    choosetableform.h \
-    createindexform.h \
-    deleteindexform.h \
-    deletetableform.h \
-    editfieldform.h \
-    editform.h \
-    edittableform.h \
-    exporttablecsvform.h \
-    findform.h \
-    importcsvform.h \
-    preferencesform.h \
-    mainwindow.h \
     SQLLogDock.h \
-    sqlitesyntaxhighlighter.h \
-    dialogabout.h
+    ChooseTableForm.h \
+    CreateIndexForm.h \
+    DeleteIndexForm.h \
+    DeleteTableForm.h \
+    DialogAbout.h \
+    EditFieldForm.h \
+    EditForm.h \
+    EditTableForm.h \
+    ExportTableCSVForm.h \
+    FindForm.h \
+    ImportCSVForm.h \
+    MainWindow.h \
+    PreferencesForm.h \
+    SQLiteSyntaxHighlighter.h
 
 SOURCES += \
-    browsermain.cpp \
     sqlitedb.cpp \
     sqlbrowser_util.c \
     sqlite_source/sqlite3.c \
-    choosetableform.cpp \
-    createindexform.cpp \
-    deleteindexform.cpp \
-    deletetableform.cpp \
-    editfieldform.cpp \
-    editform.cpp \
-    edittableform.cpp \
-    exporttablecsvform.cpp \
-    findform.cpp \
-    importcsvform.cpp \
-    preferencesform.cpp \
-    mainwindow.cpp \
     SQLLogDock.cpp \
-    sqlitesyntaxhighlighter.cpp \
-    dialogabout.cpp
+    main.cpp \
+    ChooseTableForm.cpp \
+    CreateIndexForm.cpp \
+    DeleteIndexForm.cpp \
+    DeleteTableForm.cpp \
+    DialogAbout.cpp \
+    EditFieldForm.cpp \
+    EditForm.cpp \
+    EditTableForm.cpp \
+    ExportTableCSVForm.cpp \
+    FindForm.cpp \
+    ImportCSVForm.cpp \
+    MainWindow.cpp \
+    PreferencesForm.cpp \
+    SQLiteSyntaxHighlighter.cpp
 
 QMAKE_CXXFLAGS += -DAPP_VERSION=\\\"`cd $$PWD;git log -n1 --format=%h_git`\\\"
 
@@ -72,8 +72,8 @@ mac {
 RESOURCES += icons/icons.qrc
 
 FORMS += \
-    dialogabout.ui \
-    preferencesform.ui \
-    mainwindow.ui \
-    editfieldform.ui \
-    edittableform.ui
+    DialogAbout.ui \
+    EditFieldForm.ui \
+    EditTableForm.ui \
+    MainWindow.ui \
+    PreferencesForm.ui