diff --git a/HybridMobileDeploy.h b/HybridMobileDeploy.h
index b51f732..82792cb 100644
--- a/HybridMobileDeploy.h
+++ b/HybridMobileDeploy.h
@@ -11,11 +11,11 @@
 + (void)setDeploymentKey:(NSString *)deploymentKey;
 + (NSString *)getDeploymentKey;
 
-+ (void)setBaseUrl:(NSString *)baseUrl;
-+ (NSString *)getBaseUrl;
++ (void)setServerUrl:(NSString *)setServerUrl;
++ (NSString *)getServerUrl;
 
-+ (void)setVersionString:(NSString *)versionString;
-+ (NSString *)getVersionString;
++ (void)setAppVersion:(NSString *)appVersion;
++ (NSString *)getAppVersion;
 
 + (void)setBuildVersion:(NSString *)buildVersion;
 + (NSString *)getBuildVersion;
diff --git a/HybridMobileDeployConfig.m b/HybridMobileDeployConfig.m
index f58592e..de601a4 100644
--- a/HybridMobileDeployConfig.m
+++ b/HybridMobileDeployConfig.m
@@ -8,8 +8,8 @@ NSMutableDictionary *configuration;
 {
     NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
     
-    NSString *version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
-    NSString *buildVersion = [infoDictionary objectForKey:@"CFBundleVersion"];
+    NSString *appVersion = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
+    NSString *buildVersion = [infoDictionary objectForKey:(NSString *)kCFBundleVersionKey];
     NSString *deploymentKey = [infoDictionary objectForKey:@"CodePushDeploymentKey"];
     NSString *serverUrl = [infoDictionary objectForKey:@"CodePushServerUrl"];
     if (!serverUrl) {
@@ -19,7 +19,7 @@ NSMutableDictionary *configuration;
     
     configuration = [[NSMutableDictionary alloc]
                                    initWithObjectsAndKeys:
-                                   version,@"versionString",
+                                   appVersion,@"appVersion",
                                    buildVersion,@"buildVersion",
                                    deploymentKey,@"deploymentKey",
                                    serverUrl,@"serverUrl",
@@ -47,14 +47,14 @@ NSMutableDictionary *configuration;
     return [configuration objectForKey:@"serverUrl"];
 }
 
-+ (void)setVersionString:(NSString *)versionString
++ (void)setAppVersion:(NSString *)appVersion
 {
-    [configuration setValue:versionString forKey:@"versionString"];
+    [configuration setValue:appVersion forKey:@"appVersion"];
 }
 
-+ (NSString *)getVersionString
++ (NSString *)getAppVersion
 {
-    return [configuration objectForKey:@"versionString"];
+    return [configuration objectForKey:@"appVersion"];
 }
 
 + (void)setBuildVersion:(NSString *)buildVersion