Table naming convention adjustent