refactoring tables name