Rename table -> table', add table which is more generalized