improve table entry naming