table rework - new names