diff --git a/JSMessagesTableViewController/JSMessageInputView.h b/JSMessagesTableViewController/JSMessageInputView.h
index 27f7cfb..0f0e227 100644
--- a/JSMessagesTableViewController/JSMessageInputView.h
+++ b/JSMessagesTableViewController/JSMessageInputView.h
@@ -34,11 +34,11 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "MADismissiveTextView.h"
+#import "JSMADismissiveTextView.h"
 
 @interface JSMessageInputView : UIImageView
 
-@property (strong, nonatomic) MADismissiveTextView *textView;
+@property (strong, nonatomic) JSMADismissiveTextView *textView;
 @property (strong, nonatomic) UIButton *sendButton;
 
 #pragma mark - Initialization
diff --git a/JSMessagesTableViewController/JSMessageInputView.m b/JSMessagesTableViewController/JSMessageInputView.m
index 0e6b22a..904dda4 100644
--- a/JSMessagesTableViewController/JSMessageInputView.m
+++ b/JSMessagesTableViewController/JSMessageInputView.m
@@ -79,7 +79,7 @@
     CGFloat width = self.frame.size.width - SEND_BUTTON_WIDTH;
     CGFloat height = [JSMessageInputView textViewLineHeight];
     
-    self.textView = [[MADismissiveTextView  alloc] initWithFrame:CGRectMake(6.0f, 3.0f, width, height)];
+    self.textView = [[JSMADismissiveTextView  alloc] initWithFrame:CGRectMake(6.0f, 3.0f, width, height)];
     self.textView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     self.textView.backgroundColor = [UIColor whiteColor];
     self.textView.scrollIndicatorInsets = UIEdgeInsetsMake(10.0f, 0.0f, 10.0f, 8.0f);
diff --git a/JSMessagesTableViewController/JSMessagesViewController.m b/JSMessagesTableViewController/JSMessagesViewController.m
index 446f819..ccf7468 100644
--- a/JSMessagesTableViewController/JSMessagesViewController.m
+++ b/JSMessagesTableViewController/JSMessagesViewController.m
@@ -37,7 +37,7 @@
 #import "NSString+JSMessagesView.h"
 #import "UIView+AnimationOptionsForCurve.h"
 #import "UIColor+JSMessagesView.h"
-#import "MADismissiveTextView.h"
+#import "JSMADismissiveTextView.h"
 
 #define INPUT_HEIGHT 40.0f
 
diff --git a/MessagesDemo.xcodeproj/project.pbxproj b/MessagesDemo.xcodeproj/project.pbxproj
index a480a43..499234d 100644
--- a/MessagesDemo.xcodeproj/project.pbxproj
+++ b/MessagesDemo.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		04E5799317A0B25E0022CD77 /* MADismissiveTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E5799217A0B25E0022CD77 /* MADismissiveTextView.m */; };
+		04E5799317A0B25E0022CD77 /* JSMADismissiveTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 04E5799217A0B25E0022CD77 /* JSMADismissiveTextView.m */; };
 		881AE55D16D13CDC008F7636 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 881AE55C16D13CDC008F7636 /* UIKit.framework */; };
 		881AE55F16D13CDC008F7636 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 881AE55E16D13CDC008F7636 /* Foundation.framework */; };
 		881AE56116D13CDC008F7636 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 881AE56016D13CDC008F7636 /* CoreGraphics.framework */; };
@@ -55,8 +55,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		04E5799117A0B25E0022CD77 /* MADismissiveTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MADismissiveTextView.h; sourceTree = "<group>"; };
-		04E5799217A0B25E0022CD77 /* MADismissiveTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MADismissiveTextView.m; sourceTree = "<group>"; };
+		04E5799117A0B25E0022CD77 /* JSMADismissiveTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMADismissiveTextView.h; sourceTree = "<group>"; };
+		04E5799217A0B25E0022CD77 /* JSMADismissiveTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSMADismissiveTextView.m; sourceTree = "<group>"; };
 		881AE55916D13CDC008F7636 /* MessagesDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MessagesDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		881AE55C16D13CDC008F7636 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		881AE55E16D13CDC008F7636 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -163,8 +163,8 @@
 		881AE56216D13CDC008F7636 /* MessagesDemo */ = {
 			isa = PBXGroup;
 			children = (
-				04E5799117A0B25E0022CD77 /* MADismissiveTextView.h */,
-				04E5799217A0B25E0022CD77 /* MADismissiveTextView.m */,
+				04E5799117A0B25E0022CD77 /* JSMADismissiveTextView.h */,
+				04E5799217A0B25E0022CD77 /* JSMADismissiveTextView.m */,
 				881AE56B16D13CDC008F7636 /* AppDelegate.h */,
 				881AE56C16D13CDC008F7636 /* AppDelegate.m */,
 				881AE58216D13DE0008F7636 /* DemoViewController.h */,
@@ -364,7 +364,7 @@
 				88301F2016F77B3D0037524D /* UIView+AnimationOptionsForCurve.m in Sources */,
 				8856C7DD16F9273C00FC921C /* UIColor+JSMessagesView.m in Sources */,
 				88E5341F16FF9B02004272FA /* UIButton+JSMessagesView.m in Sources */,
-				04E5799317A0B25E0022CD77 /* MADismissiveTextView.m in Sources */,
+				04E5799317A0B25E0022CD77 /* JSMADismissiveTextView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MessagesDemo/MADismissiveTextView.h b/MessagesDemo/JSMADismissiveTextView.h
similarity index 92%
rename from MessagesDemo/MADismissiveTextView.h
rename to MessagesDemo/JSMADismissiveTextView.h
index 50ccf5f..75036ef 100644
--- a/MessagesDemo/MADismissiveTextView.h
+++ b/MessagesDemo/JSMADismissiveTextView.h
@@ -17,7 +17,7 @@
 - (void)keyboardWillSnapBackTo:(CGPoint)keyboardOrigin;
 @end
 
-@interface MADismissiveTextView : UITextView
+@interface JSMADismissiveTextView : UITextView
 
 @property (nonatomic, weak) id <MADismissiveKeyboardDelegate> keyboardDelegate;
 @property (nonatomic, strong) UIPanGestureRecognizer *dismissivePanGestureRecognizer;
diff --git a/MessagesDemo/MADismissiveTextView.m b/MessagesDemo/JSMADismissiveTextView.m
similarity index 97%
rename from MessagesDemo/MADismissiveTextView.m
rename to MessagesDemo/JSMADismissiveTextView.m
index a72afe5..62871bf 100644
--- a/MessagesDemo/MADismissiveTextView.m
+++ b/MessagesDemo/JSMADismissiveTextView.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2012 Mike Ahmarani. All rights reserved.
 //
 
-#import "MADismissiveTextView.h"
+#import "JSMADismissiveTextView.h"
 
-@interface MADismissiveTextView ()
+@interface JSMADismissiveTextView ()
 
 @property (nonatomic, strong) UIView *keyboard;
 @property (nonatomic, readwrite) float originalKeyboardY; 
@@ -19,7 +19,7 @@
 
 @end
 
-@implementation MADismissiveTextView
+@implementation JSMADismissiveTextView
 
 @synthesize keyboard, dismissivePanGestureRecognizer, originalKeyboardY, keyboardDelegate;