Rename tokens to match Actions methods to actually run the right action.

As per the conversation on IRC.