Refactored NamingConventions for Datatable