diff --git a/src/main.rs b/src/main.rs
index 4cbb30f..3b15a42 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,7 +23,7 @@
  */
 
 pub mod main_module;
-use crate::main_module::data::DataObject::DataObject;
+use crate::main_module::data::data_object::DataObject;
 
 fn main() {
     let new_obj = DataObject::new("name", "Oleg");
diff --git a/src/main_module/controller/CreateTableHandler.rs b/src/main_module/controller/create_table_handler.rs
similarity index 88%
rename from src/main_module/controller/CreateTableHandler.rs
rename to src/main_module/controller/create_table_handler.rs
index 50a8970..c3df3f8 100644
--- a/src/main_module/controller/CreateTableHandler.rs
+++ b/src/main_module/controller/create_table_handler.rs
@@ -22,18 +22,18 @@
  * SOFTWARE.
  */
 
-use crate::main_module::data::DataHandler::DataHandler;
+use crate::main_module::data::data_handler::DataHandler;
 
 pub struct CreateTableHandler {
-    dataHandler: DataHandler,
+    data_handler: DataHandler,
 }
 
 impl CreateTableHandler {
     pub fn new() -> Self {
-        let dataHandler = DataHandler::new();
+        let data_handler = DataHandler::new();
 
         CreateTableHandler {
-            dataHandler,
+            data_handler,
         }
     }
 }
diff --git a/src/main_module/controller/mod.rs b/src/main_module/controller/mod.rs
index 4b34760..78a4ca3 100644
--- a/src/main_module/controller/mod.rs
+++ b/src/main_module/controller/mod.rs
@@ -22,4 +22,4 @@
  * SOFTWARE.
  */
 
-pub mod CreateTableHandler;
+pub mod create_table_handler;
diff --git a/src/main_module/data/DataHandler.rs b/src/main_module/data/data_handler.rs
similarity index 96%
rename from src/main_module/data/DataHandler.rs
rename to src/main_module/data/data_handler.rs
index fbf7b4c..e13aca3 100644
--- a/src/main_module/data/DataHandler.rs
+++ b/src/main_module/data/data_handler.rs
@@ -23,7 +23,7 @@
  */
 
 use std::collections::HashMap;
-use crate::main_module::data::Table::Table;
+use crate::main_module::data::table::Table;
 
 pub struct DataHandler {
     tables: HashMap<String, Table>,
diff --git a/src/main_module/data/DataObject.rs b/src/main_module/data/data_object.rs
similarity index 94%
rename from src/main_module/data/DataObject.rs
rename to src/main_module/data/data_object.rs
index b6a09fb..f6b2abe 100644
--- a/src/main_module/data/DataObject.rs
+++ b/src/main_module/data/data_object.rs
@@ -25,14 +25,14 @@
 #[derive(Debug)]
 
 pub struct DataObject {
-    fieldName: String,
+    field_name: String,
     value: String,
 }
 
 impl DataObject{
     pub fn new(field_name: &str, field_value: &str) -> Self {
         DataObject {
-            fieldName: String::from(field_name),
+            field_name: String::from(field_name),
             value: String::from(field_value),
         }
     }
diff --git a/src/main_module/data/mod.rs b/src/main_module/data/mod.rs
index 8571e40..8219d00 100644
--- a/src/main_module/data/mod.rs
+++ b/src/main_module/data/mod.rs
@@ -22,6 +22,6 @@
  * SOFTWARE.
  */
 
-pub mod DataHandler;
-pub mod DataObject;
-pub mod Table;
+pub mod data_handler;
+pub mod data_object;
+pub mod table;
diff --git a/src/main_module/data/Table.rs b/src/main_module/data/table.rs
similarity index 78%
rename from src/main_module/data/Table.rs
rename to src/main_module/data/table.rs
index de15bbb..c1c58fa 100644
--- a/src/main_module/data/Table.rs
+++ b/src/main_module/data/table.rs
@@ -26,20 +26,20 @@ use std::collections::{HashSet, HashMap};
 use crate::DataObject;
 
 pub struct Table {
-    errorId: String,
-    errorArg: String,
-    errorRws: String,
-    columnNames: HashSet<String>,
+    error_id: String,
+    error_arg: String,
+    error_rws: String,
+    column_names: HashSet<String>,
     rows: HashMap<String, Vec<DataObject>>,
 }
 
 impl Table {
     pub fn new() -> Self {
         Table {
-            errorId: String::from("[ERROR] [Incorrect ID]"),
-            errorArg: String::from("[ERROR] [Incorrect rows in insert data package"),
-            errorRws: String::from("[ERROR] [Trying to reach an empty row]"),
-            columnNames: HashSet::new(),
+            error_id: String::from("[ERROR] [Incorrect ID]"),
+            error_arg: String::from("[ERROR] [Incorrect rows in insert data package"),
+            error_rws: String::from("[ERROR] [Trying to reach an empty row]"),
+            column_names: HashSet::new(),
             rows: HashMap::new(),
         }
     }