Rename variables and use table helper