Work in progree to change names
Changed some variables and attributes names
Use statments
Merge branch 'feature/ticket-19' into develop