1 files changed, 8 insertions, 7 deletions
diff --git a/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink/SDLOnKeyboardInput.m
index a6bd02295..6f781c377 100644
--- a/SmartDeviceLink/SDLOnKeyboardInput.m
+++ b/SmartDeviceLink/SDLOnKeyboardInput.m
@@ -4,33 +4,34 @@
 #import "SDLOnKeyboardInput.h"
 
 #import "NSMutableDictionary+Store.h"
-#import "SDLNames.h"
+#import "SDLRPCParameterNames.h"
+#import "SDLRPCFunctionNames.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @implementation SDLOnKeyboardInput
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameOnKeyboardInput]) {
+    if (self = [super initWithName:SDLRPCFunctionNameOnKeyboardInput]) {
     }
     return self;
 }
 
 - (void)setEvent:(SDLKeyboardEvent)event {
-    [parameters sdl_setObject:event forName:SDLNameEvent];
+    [parameters sdl_setObject:event forName:SDLRPCParameterNameEvent];
 }
 
 - (SDLKeyboardEvent)event {
-    NSObject *obj = [parameters sdl_objectForName:SDLNameEvent];
-    return (SDLKeyboardEvent)obj;
+    NSError *error = nil;
+    return [parameters sdl_enumForName:SDLRPCParameterNameEvent error:&error];
 }
 
 - (void)setData:(nullable NSString *)data {
-    [parameters sdl_setObject:data forName:SDLNameData];
+    [parameters sdl_setObject:data forName:SDLRPCParameterNameData];
 }
 
 - (nullable NSString *)data {
-    return [parameters sdl_objectForName:SDLNameData];
+    return [parameters sdl_objectForName:SDLRPCParameterNameData ofClass:NSString.class error:nil];
 }
 
 @end