[wip] Remove dependence from tables names