Rename token classes to match command

The token create/delete commands were renamed but not the class names.
Rename them to match.

Change-Id: Icbf9c0a954ed0332fa4c99e4ee2612bb11f89e3a
Merge "Rename token classes to match command"