diff --git a/winixd/models/group.h b/winixd/models/group.h
index 3cb6c21..b22ce12 100644
--- a/winixd/models/group.h
+++ b/winixd/models/group.h
@@ -59,15 +59,15 @@ public:
 	}
 
 
-	void map_fields()
+	void fields()
 	{
 		field(L"id",	id, morm::FT::no_insertable | morm::FT::no_updatable | morm::FT::primary_key);
 		field(L"name", 	name);
 	}
 
-	void prepare_table()
+	void table()
 	{
-		table(L"core", L"group");
+		table_name(L"core", L"group");
 	}
 
 	void after_insert()
diff --git a/winixd/models/item.cpp b/winixd/models/item.cpp
index 55a8d6c..1849ad5 100644
--- a/winixd/models/item.cpp
+++ b/winixd/models/item.cpp
@@ -50,7 +50,7 @@ Item::Item()
 
 
 
-void Item::map_fields()
+void Item::fields()
 {
 	//ItemModelData * item_model_data = dynamic_cast<ItemModelData>(get_model_data());
 
@@ -70,9 +70,9 @@ void Item::map_fields()
 }
 
 
-void Item::prepare_table()
+void Item::table()
 {
-	table(L"core", L"item");
+	table_name(L"core", L"item");
 }
 
 
diff --git a/winixd/models/item.h b/winixd/models/item.h
index d015673..7906ad0 100644
--- a/winixd/models/item.h
+++ b/winixd/models/item.h
@@ -54,18 +54,18 @@ class CalcItemsHelper : public morm::Model
 public:
 
 	long size;
-
 	long item_id;
 
-	void map_fields()
+
+	void fields()
 	{
 		field(L"size", size);
 		field(L"item_id", item_id);
 	}
 
-	void prepare_table()
+	void table()
 	{
-		table(L"core", L"item");
+		table_name(L"core", L"item");
 	}
 
 };
@@ -146,8 +146,8 @@ public:
 
 	Item();
 
-	void map_fields();
-	void prepare_table();
+	void fields();
+	void table();
 	void before_insert();
 	void after_insert();
 
diff --git a/winixd/models/itemcontent.cpp b/winixd/models/itemcontent.cpp
index 30b5390..090d233 100644
--- a/winixd/models/itemcontent.cpp
+++ b/winixd/models/itemcontent.cpp
@@ -51,7 +51,7 @@ ItemContent::ItemContent()
 
 
 
-void ItemContent::map_fields()
+void ItemContent::fields()
 {
 	int content_raw_type_helper = static_cast<int>(content_raw_type);
 	int content_parsed_type_helper = static_cast<int>(content_parsed_type);
@@ -86,9 +86,9 @@ void ItemContent::map_fields()
 }
 
 
-void ItemContent::prepare_table()
+void ItemContent::table()
 {
-	table(L"core", L"content");
+	table_name(L"core", L"content");
 }
 
 
diff --git a/winixd/models/itemcontent.h b/winixd/models/itemcontent.h
index d6a08f5..ea45c19 100644
--- a/winixd/models/itemcontent.h
+++ b/winixd/models/itemcontent.h
@@ -212,8 +212,8 @@ public:
 
 	ItemContent();
 
-	void map_fields();
-	void prepare_table();
+	void fields();
+	void table();
 	void after_insert();
 
 
diff --git a/winixd/models/user.cpp b/winixd/models/user.cpp
index 099b63c..46e45fa 100644
--- a/winixd/models/user.cpp
+++ b/winixd/models/user.cpp
@@ -49,7 +49,7 @@ User::User()
 
 
 
-void User::map_fields()
+void User::fields()
 {
 	field(L"id",				id, morm::FT::no_insertable | morm::FT::no_updatable | morm::FT::primary_key);
 	field(L"login",				name); // IMPROVEME set the same name, either 'login' or 'name'
@@ -71,9 +71,9 @@ void User::map_fields()
 }
 
 
-void User::prepare_table()
+void User::table()
 {
-	table(L"core", L"user");
+	table_name(L"core", L"user");
 }
 
 
diff --git a/winixd/models/user.h b/winixd/models/user.h
index 6afb242..77beec3 100644
--- a/winixd/models/user.h
+++ b/winixd/models/user.h
@@ -129,11 +129,10 @@ public:
 	std::vector<long> groups;
 
 
-
 	User();
 	
-	void map_fields();
-	void prepare_table();
+	void fields();
+	void table();
 	void after_insert();
 	void after_select();