diff --git a/lib/db_base.cpp b/lib/db_base.cpp
index 3edf473b..720ff334 100644
--- a/lib/db_base.cpp
+++ b/lib/db_base.cpp
@@ -37,13 +37,13 @@ void db_base::restart_timer()
 	hoursTimer = startTimer(MSECS_PER_HOUR);
 }
 
-db_base::db_base(database_model *parent)
+db_base::db_base(database_model *parent, const char *classname)
 	:QAbstractItemModel(parent)
 {
 	rootItem = newPKI();
 	rootItem->setIntName(rootItem->getClassName());
 	colResizing = 0;
-	class_name = "base";
+	class_name = classname;
 	secondsTimer = minutesTimer = hoursTimer = 0;
 	restart_timer();
 }
@@ -62,7 +62,7 @@ database_model *db_base::models()
 pki_base *db_base::newPKI(enum pki_type type)
 {
 	(void)type;
-	return new pki_base("rootItem");
+	return new pki_base();
 }
 
 void db_base::createSuccess(pki_base *pki)
diff --git a/lib/db_base.h b/lib/db_base.h
index f1704d12..d5103f61 100644
--- a/lib/db_base.h
+++ b/lib/db_base.h
@@ -66,7 +66,7 @@ class db_base: public QAbstractItemModel
 
 		virtual pki_base *newPKI(enum pki_type type = none);
 		pki_base *rootItem;
-		db_base(database_model *parent);
+		db_base(database_model *parent, const char *classname);
 		virtual void updateHeaders();
 		virtual ~db_base();
 		virtual void insertPKI(pki_base *pki);
diff --git a/lib/db_crl.cpp b/lib/db_crl.cpp
index 28453a2e..75f0f293 100644
--- a/lib/db_crl.cpp
+++ b/lib/db_crl.cpp
@@ -20,9 +20,8 @@
 #include "ui_NewCrl.h"
 
 db_crl::db_crl(database_model *parent)
-	:db_x509name(parent)
+	:db_x509name(parent, "crls")
 {
-	class_name = "crls";
 	sqlHashTable = "crls";
 	pkitype << revocation;
 	pkitype_depends << x509;
diff --git a/lib/db_key.cpp b/lib/db_key.cpp
index b3122a3c..7d170b12 100644
--- a/lib/db_key.cpp
+++ b/lib/db_key.cpp
@@ -24,9 +24,8 @@
 #include "widgets/ExportDialog.h"
 
 db_key::db_key(database_model *parent)
-	:db_base(parent)
+	:db_base(parent, "keys")
 {
-	class_name = "keys";
 	sqlHashTable = "public_keys";
 	pkitype << asym_key << smartCard;
 	updateHeaders();
diff --git a/lib/db_temp.cpp b/lib/db_temp.cpp
index a552613d..37b04866 100644
--- a/lib/db_temp.cpp
+++ b/lib/db_temp.cpp
@@ -20,9 +20,8 @@
 #include <QFileInfo>
 
 db_temp::db_temp(database_model *parent)
-	:db_x509name(parent)
+	:db_x509name(parent, "templates")
 {
-	class_name = "templates";
 	sqlHashTable = "templates";
 	pkitype << tmpl;
 
diff --git a/lib/db_token.cpp b/lib/db_token.cpp
index e6c06f9a..9723aa52 100644
--- a/lib/db_token.cpp
+++ b/lib/db_token.cpp
@@ -6,9 +6,8 @@
 #include "widgets/XcaWarning.h"
 
 db_token::db_token(database_model *parent)
-        :db_base(parent)
+        :db_base(parent, "manageTokens")
 {
-	class_name = "manageTokens";
 	updateHeaders();
 }
 
diff --git a/lib/db_x509.cpp b/lib/db_x509.cpp
index 23b8adae..805e2b54 100644
--- a/lib/db_x509.cpp
+++ b/lib/db_x509.cpp
@@ -35,9 +35,8 @@
 bool db_x509::treeview = true;
 
 db_x509::db_x509(database_model *parent)
-	:db_x509super(parent)
+	:db_x509super(parent, "certificates")
 {
-	class_name = "certificates";
 	sqlHashTable = "certs";
 	pkitype << x509;
 	pkitype_depends << x509_req;
diff --git a/lib/db_x509req.cpp b/lib/db_x509req.cpp
index 4f0f7ea8..dd37c686 100644
--- a/lib/db_x509req.cpp
+++ b/lib/db_x509req.cpp
@@ -15,9 +15,8 @@
 
 
 db_x509req::db_x509req(database_model *parent)
-	:db_x509super(parent)
+	:db_x509super(parent, "requests")
 {
-	class_name = "requests";
 	sqlHashTable = "requests";
 	pkitype << x509_req;
 	pkitype_depends << x509;
diff --git a/lib/db_x509super.cpp b/lib/db_x509super.cpp
index ddeae20f..e9cbc64c 100644
--- a/lib/db_x509super.cpp
+++ b/lib/db_x509super.cpp
@@ -19,8 +19,8 @@
 #include <QFileDialog>
 #include <QFileInfo>
 
-db_x509name::db_x509name(database_model *parent)
-	:db_base(parent)
+db_x509name::db_x509name(database_model *parent, const char *classname)
+	:db_base(parent, classname)
 {
 }
 
@@ -37,8 +37,8 @@ dbheaderList db_x509name::getHeaders()
 	return h;
 }
 
-db_x509super::db_x509super(database_model *parent)
-	:db_x509name(parent)
+db_x509super::db_x509super(database_model *parent, const char *classname)
+	:db_x509name(parent, classname)
 {
 	pkitype_depends << asym_key << smartCard;
 }
diff --git a/lib/db_x509super.h b/lib/db_x509super.h
index c470ba5e..cfb0a4bc 100644
--- a/lib/db_x509super.h
+++ b/lib/db_x509super.h
@@ -20,7 +20,7 @@ class db_x509name: public db_base
 	protected:
 		dbheaderList getHeaders();
 	public:
-		db_x509name(database_model *parent);
+		db_x509name(database_model *parent, const char *classname);
 };
 
 class db_x509super: public db_x509name
@@ -31,7 +31,7 @@ class db_x509super: public db_x509name
 		dbheaderList getHeaders();
 		void loadContainer();
 	public:
-		db_x509super(database_model *parent);
+		db_x509super(database_model *parent, const char *classname);
 		pki_key *findKey(pki_x509super *ref);
 		QList<pki_x509super *> findByPubKey(pki_key *refkey);
 		void extractPubkey(QModelIndex index);