--- a/cocoa/ScintillaView.h
+++ b/cocoa/ScintillaView.h
@@ -49,9 +49,9 @@
 @end
 
 /**
- * MarginView draws line numbers and other margins next to the text view.
- */
-@interface MarginView : NSRulerView
+ * SCIMarginView draws line numbers and other margins next to the text view.
+ */
+@interface SCIMarginView : NSRulerView
 {
 @private
   int marginWidth;
@@ -67,10 +67,10 @@
 @end
 
 /**
- * InnerView is the Cocoa interface to the Scintilla backend. It handles text input and
+ * SCIContentView is the Cocoa interface to the Scintilla backend. It handles text input and
  * provides a canvas for painting the output.
  */
-@interface InnerView : NSView <NSTextInputClient, NSUserInterfaceValidations>
+@interface SCIContentView : NSView <NSTextInputClient, NSUserInterfaceValidations>
 {
 @private
   ScintillaView* mOwner;
@@ -100,10 +100,10 @@
   Scintilla::ScintillaCocoa* mBackend;
   
   // This is the actual content to which the backend renders itself.
-  InnerView* mContent;
+  SCIContentView* mContent;
   
   NSScrollView *scrollView;
-  MarginView *marginView;
+  SCIMarginView *marginView;
   
   CGFloat zoomDelta;
   
@@ -118,7 +118,7 @@
 @property (nonatomic, assign) id<ScintillaNotificationProtocol> delegate;
 @property (nonatomic, readonly) NSScrollView *scrollView;
 
-+ (Class) innerViewClass;
++ (Class) contentViewClass;
 
 - (void) positionSubViews;
 
@@ -133,7 +133,7 @@
 // Scroller handling
 - (void) setMarginWidth: (int) width;
 - (void) scrollerAction: (id) sender;
-- (InnerView*) content;
+- (SCIContentView*) content;
 
 // NSTextView compatibility layer.
 - (NSString*) string;