Update to use short_name and full_name.

Change-Id: I7a6895e9cdc42b7ba2aa8c2bec74633b5e23d724