Some refactorings to entity classes to have proper naming for getters and setters.

Signed-off-by: Kavith Thiranga Lokuhewage <rc404mekt@gmail.com>