Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Article.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -9,4 +9,5 @@
 @Entity
 @Data
+@Table(name = "article", schema = "IND0_185022")
 public class Article {
     @Id
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Article_Unit.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Article_Unit.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Article_Unit.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -8,4 +8,5 @@
 @Entity
 @Data
+@Table(name = "article_unit", schema = "IND0_185022")
 public class Article_Unit {
     @Id
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Category.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -8,4 +8,5 @@
 @Entity(name = "Category")
 @Data
+@Table(name = "category", schema = "IND0_185022")
 public class Category {
     @Id
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/City.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/City.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/City.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -8,4 +8,5 @@
 @Entity
 @Data
+@Table(name = "city", schema = "IND0_185022")
 public class City {
     @Id
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Customer.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -4,4 +4,5 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,6 +14,7 @@
 @Entity
 @Data
+@Table(name = "customer", schema = "IND0_185022")
 public class Customer extends Users {
-    @Column(name = "cust_EDB", nullable = false)
+    @Column(name = "cust_EDB", nullable = false, length = 13)
     private String customer_EDB;
 
@@ -29,5 +31,5 @@
     private LocalTime customer_close_time;
 
-    @Column(name = "cust_representative_image", nullable = false)
+    @Column(name = "cust_representative_img", nullable = false)
     private String customer_representative_image;
 
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/CustomerWeekday.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -0,0 +1,33 @@
+package mk.ukim.finki.db.distributorapp.model;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalTime;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "customer_weekday", schema = "IND0_185022")
+public class CustomerWeekday {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "cust_day_id", nullable = false)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "cust_id", nullable = false)
+    private Customer cust;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "day_id", nullable = false)
+    private Weekday day;
+
+    @Column(name = "start_time", nullable = false)
+    private LocalTime startTime;
+
+    @Column(name = "end_time", nullable = false)
+    private LocalTime endTime;
+
+}
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Delivery.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -11,4 +11,5 @@
 @Entity
 @Data
+@Table(name = "delivery", schema = "IND0_185022")
 public class Delivery {
     @Id
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Driver.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Driver.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Driver.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -4,4 +4,5 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,7 +11,8 @@
 @Entity
 @Data
+@Table(name = "driver", schema = "IND0_185022")
 public class Driver extends Users {
     @OneToOne
-    @JoinColumn(name = "vh_id", nullable = false)
+    @JoinColumn(name = "veh_id", nullable = false)
     private Vehicle vehicle;
 }
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Manager.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Manager.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Manager.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -4,4 +4,5 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,4 +11,5 @@
 @Entity
 @Data
+@Table(name = "manager", schema = "IND0_185022")
 public class Manager extends Users{
     @OneToOne
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Manufacturer.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -8,4 +8,5 @@
 @Entity
 @Data
+@Table(name = "manufacturer", schema = "IND0_185022")
 public class Manufacturer {
     @Id
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Orders.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -11,4 +11,5 @@
 @Entity
 @Data
+@Table(name = "orders", schema = "IND0_185022")
 public class Orders {
     @Id
@@ -34,9 +35,9 @@
 
     @ManyToOne
-    @JoinColumn(name = "user_id")
+    @JoinColumn(name = "cust_id")
     private Customer customer;
 
     @ManyToOne
-    @JoinColumn(name = "delivery_id", nullable = false)
+    @JoinColumn(name = "del_id", nullable = false)
     private Delivery delivery;
 
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Price.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -9,4 +9,5 @@
 @Entity
 @Data
+@Table(name = "price", schema = "IND0_185022")
 public class Price {
     @Id
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Pro_Forma.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Pro_Forma.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Pro_Forma.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -9,4 +9,5 @@
 @Entity
 @Data
+@Table(name = "pro_forma", schema = "IND0_185022")
 public class Pro_Forma {
     @Id
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Users.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -17,4 +17,5 @@
 @Inheritance(strategy = InheritanceType.JOINED)
 @Data
+@Table(name = "users", schema = "IND0_185022")
 public abstract class Users implements UserDetails {
     @Id
@@ -22,25 +23,26 @@
     private Long user_id;
 
-    @Column(nullable = false)
+    @Column(name = "user_name", nullable = false)
     private String user_name;
 
-    @Column(nullable = false)
+    @Column(name = "user_surname", nullable = false)
     private String user_surname;
 
-    @Column(nullable = false)
+    @Column(name = "user_pass", nullable = false)
     private String user_password;
 
-    @Column(nullable = false)
+    @Column(name = "user_email", nullable = false)
     private String user_email;
 
-    @Column(nullable = false)
+    @Column(name = "user_mobile", nullable = false)
     private String user_mobile;
 
-    @Column(nullable = false)
+    @Column(name = "user_salt", nullable = false)
     private String user_salt;
 
-    @Column(nullable = false)
+    @Column(name = "user_email_conf", nullable = false)
     private Boolean user_active;
 
+    @Column(name = "user_image")
     private String user_image;
 
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Vehicle.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -9,4 +9,5 @@
 @Entity
 @Data
+@Table(name = "vehicle", schema = "IND0_185022")
 public class Vehicle {
     @Id
@@ -30,8 +31,8 @@
     private Integer vehicle_last_service_km;
 
-    @Column(name = "veh_plate", nullable = false)
+    @Column(name = "veh_plate", nullable = false, length = 8)
     private String vehicle_plate;
 
-    @Column(name = "veh_vin", nullable = false)
+    @Column(name = "veh_vin", nullable = false, length = 17)
     private String vehicle_vin;
 
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Warehouse.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -8,4 +8,5 @@
 @Entity
 @Data
+@Table(name = "warehouse", schema = "IND0_185022")
 public class Warehouse {
     @Id
Index: src/main/java/mk/ukim/finki/db/distributorapp/model/Weekday.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/model/Weekday.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
+++ src/main/java/mk/ukim/finki/db/distributorapp/model/Weekday.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -0,0 +1,25 @@
+package mk.ukim.finki.db.distributorapp.model;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "weekday", schema = "IND0_185022")
+public class Weekday {
+    @Id
+    @Column(name = "day_id", nullable = false)
+    private Short id;
+
+    @Column(name = "day_name", nullable = false, length = 20)
+    private String dayName;
+
+    @OneToMany(mappedBy = "day")
+    private Set<CustomerWeekday> customerWeekdays = new LinkedHashSet<>();
+
+}
Index: src/main/java/mk/ukim/finki/db/distributorapp/security/ConfirmationToken.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/security/ConfirmationToken.java	(revision 401e38c5b45d3ac55e02831c32bf4e174bae08ca)
+++ src/main/java/mk/ukim/finki/db/distributorapp/security/ConfirmationToken.java	(revision f45ae325e33d724cef8c1ffad07a3e51eb10ac89)
@@ -15,13 +15,15 @@
 @AllArgsConstructor
 @Entity
-@Table(name = "confirmationToken")
+@Table(name = "token", schema = "IND0_185022")
 public class ConfirmationToken {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "token_id")
+    @Column(name = "t_id")
     private Long tokenId;
 
+    @Column(name = "t_value")
     private String confirmationToken;
 
+    @Column(name = "t_date")
     private Date createdDate;