diff --git a/model/src/main/java/lcsb/mapviewer/model/plugin/PluginDataEntry.java b/model/src/main/java/lcsb/mapviewer/model/plugin/PluginDataEntry.java
index 27c0e6b03b067e9bd219ae0f1f5b47816cccddb0..057bf3f38ac45ee87bec8ab54cd68bec7a986359 100644
--- a/model/src/main/java/lcsb/mapviewer/model/plugin/PluginDataEntry.java
+++ b/model/src/main/java/lcsb/mapviewer/model/plugin/PluginDataEntry.java
@@ -39,10 +39,10 @@ public class PluginDataEntry implements Serializable {
   @ManyToOne(fetch = FetchType.LAZY, optional = false)
   private Plugin plugin;
 
-  @Column(name = "entry_key", nullable = false)
+  @Column(nullable = false)
   private String key;
 
-  @Column(name = "entry_value", nullable = false)
+  @Column(nullable = false)
   private String value;
 
   public int getId() {
diff --git a/persist/src/main/java/lcsb/mapviewer/persist/dao/plugin/PluginDataEntryDao.java b/persist/src/main/java/lcsb/mapviewer/persist/dao/plugin/PluginDataEntryDao.java
index d03af82965d9911022d99ff8610148e8ddedd013..35e5ff4ca1c3ded3de16fa28bc7aeafbd4a5c3af 100644
--- a/persist/src/main/java/lcsb/mapviewer/persist/dao/plugin/PluginDataEntryDao.java
+++ b/persist/src/main/java/lcsb/mapviewer/persist/dao/plugin/PluginDataEntryDao.java
@@ -25,12 +25,12 @@ public class PluginDataEntryDao extends BaseDao<PluginDataEntry> {
 
   public PluginDataEntry getByKey(Plugin plugin, String key, User user) {
     List<Pair<String, Object>> params = new ArrayList<>();
-    params.add(new Pair<String, Object>("plugin_id", plugin.getId()));
-    params.add(new Pair<String, Object>("entry_key", key));
+    params.add(new Pair<>("plugin_id", plugin.getId()));
+    params.add(new Pair<>("key", key));
     if (user == null) {
-      params.add(new Pair<String, Object>("user_id", null));
+      params.add(new Pair<>("user_id", null));
     } else {
-      params.add(new Pair<String, Object>("user_id", user.getId()));
+      params.add(new Pair<>("user_id", user.getId()));
     }
     List<PluginDataEntry> entries = getElementsByParameters(params);
     if (entries.size() > 0) {
diff --git a/persist/src/main/resources/db/migration/12.2.0~alpha.0/V12.2.0.20181031__plugin_data_entry_fields_renamed.sql b/persist/src/main/resources/db/migration/12.2.0~alpha.0/V12.2.0.20181031__plugin_data_entry_fields_renamed.sql
new file mode 100644
index 0000000000000000000000000000000000000000..6784010ebb4b9c437a3a401658173bcbd8965d3a
--- /dev/null
+++ b/persist/src/main/resources/db/migration/12.2.0~alpha.0/V12.2.0.20181031__plugin_data_entry_fields_renamed.sql
@@ -0,0 +1,2 @@
+alter table plugin_data_entry_table rename column entry_value to value;
+alter table plugin_data_entry_table rename column entry_key to key;