Simplify command names in apikeys module. Fix an error in apikeys list