diff --git a/.gitignore b/.gitignore
index 9969143b..ea35a8a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,5 +23,6 @@
 /ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/bin
 /ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/obj
 
+*.coatidb
 *.sqlite
 *.swp
diff --git a/bin/app/data/ApplicationSettings_for_package.xml b/bin/app/data/ApplicationSettings_for_package.xml
index 182f87f5..e22c48fa 100644
--- a/bin/app/data/ApplicationSettings_for_package.xml
+++ b/bin/app/data/ApplicationSettings_for_package.xml
@@ -2,8 +2,8 @@
 <config>
     <user>
         <recent_projects>
-            <recent_project>./data/projects/tutorial/tutorial.xml</recent_project>
-            <recent_project>./data/projects/tictactoe/tictactoe.xml</recent_project>
+            <recent_project>./data/projects/tutorial/tutorial.coatiproject</recent_project>
+            <recent_project>./data/projects/tictactoe/tictactoe.coatiproject</recent_project>
         </recent_projects>
     </user>
 </config>
diff --git a/bin/app/data/projects/tictactoe/tictactoe.xml b/bin/app/data/projects/tictactoe/tictactoe.coatiproject
similarity index 100%
rename from bin/app/data/projects/tictactoe/tictactoe.xml
rename to bin/app/data/projects/tictactoe/tictactoe.coatiproject
diff --git a/bin/app/data/projects/tutorial/tutorial.xml b/bin/app/data/projects/tutorial/tutorial.coatiproject
similarity index 100%
rename from bin/app/data/projects/tutorial/tutorial.xml
rename to bin/app/data/projects/tutorial/tutorial.coatiproject
diff --git a/src/app/qt/window/QtMainWindow.cpp b/src/app/qt/window/QtMainWindow.cpp
index 176a593c..b190c280 100644
--- a/src/app/qt/window/QtMainWindow.cpp
+++ b/src/app/qt/window/QtMainWindow.cpp
@@ -311,7 +311,7 @@ void QtMainWindow::openProject(const QString &path)
 
 	if (fileName.isNull())
 	{
-		fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "", "XML Files (*.xml)");
+		fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "", "Coati Project Files (*.coatiproject)");
 	}
 
 	if (!fileName.isEmpty())
@@ -361,7 +361,7 @@ void QtMainWindow::saveProject()
 void QtMainWindow::saveAsProject()
 {
 	QString filename = "";
-	filename = QFileDialog::getSaveFileName(this, "Save File as", "", "XML Files(*.xml)");
+	filename = QFileDialog::getSaveFileName(this, "Save File as", "", "Coati Project Files(*.coatiproject)");
 
 	if(!filename.isEmpty())
 	{
diff --git a/src/app/qt/window/QtProjectSetupScreen.cpp b/src/app/qt/window/QtProjectSetupScreen.cpp
index 1456a5df..eaabe7b2 100644
--- a/src/app/qt/window/QtProjectSetupScreen.cpp
+++ b/src/app/qt/window/QtProjectSetupScreen.cpp
@@ -194,7 +194,7 @@ void QtProjectSetupScreen::handleUpdateButtonPress()
 	}
 
 	std::string projectFile =
-		m_projectFileLocation->getText().toStdString() + "/" + m_projectName->text().toStdString() + ".xml";
+		m_projectFileLocation->getText().toStdString() + "/" + m_projectName->text().toStdString() + ".coatiproject";
 	projSettings->save(projectFile);
 
 	MessageLoadProject(projectFile).dispatch();
diff --git a/src/lib/Project.cpp b/src/lib/Project.cpp
index 0daf3b6d..5283a58e 100644
--- a/src/lib/Project.cpp
+++ b/src/lib/Project.cpp
@@ -142,7 +142,7 @@ void Project::setProjectSettingsFilePath(const FilePath& path)
 	}
 	else if (m_projectSettingsFilepath != path)
 	{
-		FilePath dbPath = FilePath(path).replaceExtension("sqlite");
+		FilePath dbPath = FilePath(path).replaceExtension("coatidb");
 		m_storageWasLoaded = dbPath.exists();
 		m_storage = std::make_shared<Storage>(dbPath);