diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 81832a610ecaa22952d179a9d8ff00dd5e966d80..db5befadd127587a8df8a86c79936b84814f80bb 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,23 +1,20 @@
-# Web
-spring.mvc.view.prefix: /WEB-INF/jsp/
-spring.mvc.view.suffix: .jsp
+# database init, supports mysql too
+database=hsqldb
+spring.datasource.schema=classpath*:db/${database}/schema.sql
+spring.datasource.data=classpath*:db/${database}/data.sql
 
+# Web
+spring.mvc.view.prefix=/WEB-INF/jsp/
+spring.mvc.view.suffix=.jsp
 
 # JPA
-spring.jpa.hibernate.ddl-auto: none
-#spring.jpa.database: HSQL
-#spring.jpa.show-sql: true
-#spring.datasource.driverClassName=org.hsqldb.jdbcDriver
-spring.datasource.schema: classpath*:db/hsqldb/initDB.sql
-spring.datasource.data: classpath*:db/hsqldb/populateDB.sql
-#spring.datasource.username: sa
-#spring.datasource.password:
+spring.jpa.hibernate.ddl-auto=none
 
 # Internationalization
-spring.messages.basename: messages/messages
+spring.messages.basename=messages/messages
 
 # Actuator / Management
-management.contextPath: /manage
+management.contextPath=/manage
 
 # Logging
 logging.level.org.springframework=INFO
diff --git a/src/main/resources/db/hsqldb/populateDB.sql b/src/main/resources/db/hsqldb/data.sql
similarity index 100%
rename from src/main/resources/db/hsqldb/populateDB.sql
rename to src/main/resources/db/hsqldb/data.sql
diff --git a/src/main/resources/db/hsqldb/initDB.sql b/src/main/resources/db/hsqldb/schema.sql
similarity index 100%
rename from src/main/resources/db/hsqldb/initDB.sql
rename to src/main/resources/db/hsqldb/schema.sql
diff --git a/src/main/resources/db/mysql/populateDB.sql b/src/main/resources/db/mysql/data.sql
similarity index 100%
rename from src/main/resources/db/mysql/populateDB.sql
rename to src/main/resources/db/mysql/data.sql
diff --git a/src/main/resources/db/mysql/initDB.sql b/src/main/resources/db/mysql/schema.sql
similarity index 100%
rename from src/main/resources/db/mysql/initDB.sql
rename to src/main/resources/db/mysql/schema.sql