diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75b26dff..ec804bac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,9 @@
 * Automatic view pause/resumes are changed with stop/start for better data consistency.
 * Added the config interface 'experimental' to group experimental features.
 * Added support for including the previous event name when recording custom events.
-* Added a flag (enableViewNameRecording) to add view names to each event. (Experimental!)
-* Added a flag (enableVisibilityTracking) to add app visibility info to views * Added Content feature methods:
+* Added a flag (enablePreviousNameRecording) to add previous event and view names as segmentation. (Experimental!)
+* Added a flag (enableVisibilityTracking) to add app visibility info to views 
+* Added Content feature methods:
 	- enterContentZone, to start Content checks(Experimental!)
 	- exitContentZone, to stop content checks (Experimental!)
 
diff --git a/Countly-PL.podspec b/Countly-PL.podspec
index b0642548..45fa4327 100644
--- a/Countly-PL.podspec
+++ b/Countly-PL.podspec
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core' do |core|
     core.source_files = '*.{h,m}'
-    core.public_header_files = 'Countly.h', 'CountlyUserDetails.h', 'CountlyConfig.h', 'CountlyFeedbackWidget.h', 'CountlyRCData.h', 'CountlyRemoteConfig.h', 'CountlyViewTracking.h', 'CountlyExperimentInformation.h', 'CountlyAPMConfig.h', 'CountlySDKLimitsConfig.h', 'Resettable.h', "CountlyCrashesConfig.h", "CountlyCrashData.h"
+    core.public_header_files = 'Countly.h', 'CountlyUserDetails.h', 'CountlyConfig.h', 'CountlyFeedbackWidget.h', 'CountlyRCData.h', 'CountlyRemoteConfig.h', 'CountlyViewTracking.h', 'CountlyExperimentInformation.h', 'CountlyAPMConfig.h', 'CountlySDKLimitsConfig.h', 'Resettable.h', "CountlyCrashesConfig.h", "CountlyCrashData.h", "CountlyContentBuilder.h", "CountlyExperimentalConfig.h"
     core.preserve_path = 'countly_dsym_uploader.sh'
     core.ios.frameworks = ['Foundation', 'UIKit', 'UserNotifications', 'CoreLocation', 'WebKit', 'CoreTelephony', 'WatchConnectivity']
   end
diff --git a/Countly.m b/Countly.m
index 1c090c69..5c8fd459 100644
--- a/Countly.m
+++ b/Countly.m
@@ -246,8 +246,8 @@ - (void)startWithConfig:(CountlyConfig *)config
     }
 #endif
     
-    if(config.experimental.enableViewNameRecording) {
-        CountlyViewTrackingInternal.sharedInstance.enableViewNameRecording = YES;
+    if(config.experimental.enablePreviousNameRecording) {
+        CountlyViewTrackingInternal.sharedInstance.enablePreviousNameRecording = YES;
     }
     if(config.experimental.enableVisibiltyTracking) {
         CountlyCommon.sharedInstance.enableVisibiltyTracking = YES;
@@ -930,7 +930,7 @@ - (void)recordEvent:(NSString *)key segmentation:(NSDictionary *)segmentation co
 
 - (NSDictionary*) processSegmentation:(NSMutableDictionary *) segmentation eventKey:(NSString *)eventKey
 {
-    if(CountlyViewTrackingInternal.sharedInstance.enableViewNameRecording) {
+    if(CountlyViewTrackingInternal.sharedInstance.enablePreviousNameRecording) {
         if([eventKey isEqualToString:kCountlyReservedEventView]) {
             segmentation[kCountlyPreviousView] = CountlyViewTrackingInternal.sharedInstance.previousViewName ?: @"";
         }
diff --git a/Countly.podspec b/Countly.podspec
index e53b86c8..4e0a25e7 100644
--- a/Countly.podspec
+++ b/Countly.podspec
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core' do |core|
     core.source_files = '*.{h,m}'
-    core.public_header_files = 'Countly.h', 'CountlyUserDetails.h', 'CountlyConfig.h', 'CountlyFeedbackWidget.h', 'CountlyRCData.h', 'CountlyRemoteConfig.h', 'CountlyViewTracking.h', 'CountlyExperimentInformation.h', 'CountlyAPMConfig.h', 'CountlySDKLimitsConfig.h', 'Resettable.h', "CountlyCrashesConfig.h", "CountlyCrashData.h"
+    core.public_header_files = 'Countly.h', 'CountlyUserDetails.h', 'CountlyConfig.h', 'CountlyFeedbackWidget.h', 'CountlyRCData.h', 'CountlyRemoteConfig.h', 'CountlyViewTracking.h', 'CountlyExperimentInformation.h', 'CountlyAPMConfig.h', 'CountlySDKLimitsConfig.h', 'Resettable.h', "CountlyCrashesConfig.h", "CountlyCrashData.h", "CountlyContentBuilder.h", "CountlyExperimentalConfig.h"
     core.preserve_path = 'countly_dsym_uploader.sh'
     core.ios.frameworks = ['Foundation', 'UIKit', 'UserNotifications', 'CoreLocation', 'WebKit', 'CoreTelephony', 'WatchConnectivity']
   end
diff --git a/CountlyExperimentalConfig.h b/CountlyExperimentalConfig.h
index 89644bcd..7e438310 100644
--- a/CountlyExperimentalConfig.h
+++ b/CountlyExperimentalConfig.h
@@ -10,7 +10,7 @@ extern NSString* const kCountlySCKeySC;
 
 @interface CountlyExperimentalConfig : NSObject
 
-@property (nonatomic) BOOL enableViewNameRecording;
+@property (nonatomic) BOOL enablePreviousNameRecording;
 @property (nonatomic) BOOL enableVisibiltyTracking;
 
 @end
diff --git a/CountlyExperimentalConfig.m b/CountlyExperimentalConfig.m
index 41432ea0..e01f3f23 100644
--- a/CountlyExperimentalConfig.m
+++ b/CountlyExperimentalConfig.m
@@ -13,7 +13,7 @@ - (instancetype)init
     if (self = [super init])
     {
         self.enableVisibiltyTracking = NO;
-        self.enableViewNameRecording = NO;
+        self.enablePreviousNameRecording = NO;
     }
     
     return self;
diff --git a/CountlyViewTrackingInternal.h b/CountlyViewTrackingInternal.h
index 4920ffbe..cc5ff653 100644
--- a/CountlyViewTrackingInternal.h
+++ b/CountlyViewTrackingInternal.h
@@ -18,7 +18,7 @@ extern NSString* const kCountlyPreviousEventName;
 @property (nonatomic) NSString* currentViewID;
 @property (nonatomic) NSString* previousViewID;
 
-@property (nonatomic) BOOL enableViewNameRecording;
+@property (nonatomic) BOOL enablePreviousNameRecording;
 //TODO: Need discussion for its usage and then we decide to keep it or remove it
 @property (nonatomic) NSString* currentViewName;
 @property (nonatomic) NSString* previousViewName;