Small refactoring of Datatable
Naming conventions based on property files