Some key function don't exist without underscores, so
remove the underscores from those.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>