moved tables to new naming
better naming scheme