Renaming buttons and table columns.

Change-Id: Ide70181d3ee73c9488696ace9bc1211bed12180f