diff --git a/src/gui/GroupView.cpp b/src/gui/GroupView.cpp
index 1c351c9c..5e3fc459 100644
--- a/src/gui/GroupView.cpp
+++ b/src/gui/GroupView.cpp
@@ -23,21 +23,21 @@
 
 GroupView::GroupView(Database* db, QWidget* parent) : QTreeView(parent)
 {
-    model = new GroupModel(db, this);
-    QTreeView::setModel(model);
+    m_model = new GroupModel(db, this);
+    QTreeView::setModel(m_model);
     recInitExpanded(db->rootGroup());
     setHeaderHidden(true);
 }
 
 void GroupView::expandedChanged(const QModelIndex& index)
 {
-    Group* group = const_cast<Group*>(model->groupFromIndex(index));
+    Group* group = const_cast<Group*>(m_model->groupFromIndex(index));
     group->setExpanded(isExpanded(index));
 }
 
 void GroupView::recInitExpanded(const Group* group)
 {
-    QModelIndex index = model->index(group);
+    QModelIndex index = m_model->index(group);
     setExpanded(index, group->isExpanded());
 
     Q_FOREACH (const Group* child, group->children()) {
diff --git a/src/gui/GroupView.h b/src/gui/GroupView.h
index 3c1ed890..9db9aa9c 100644
--- a/src/gui/GroupView.h
+++ b/src/gui/GroupView.h
@@ -38,8 +38,7 @@ private Q_SLOTS:
 private:
     void recInitExpanded(const Group* group);
 
-    Database* db;
-    GroupModel* model;
+    GroupModel* m_model;
 };
 
 #endif // KEEPASSX_GROUPVIEW_H