--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -377,7 +377,7 @@
 
 //----------------- ScintillaCocoa -----------------------------------------------------------------
 
-ScintillaCocoa::ScintillaCocoa(InnerView* view, MarginView* viewMargin)
+ScintillaCocoa::ScintillaCocoa(SCIContentView* view, SCIMarginView* viewMargin)
 {
   vs.marginInside = false;
   wMain = view; // Don't retain since we're owned by view, which would cause a cycle
@@ -679,9 +679,9 @@
 /**
  * Helper function to get the inner container which represents the actual "canvas" we work with.
  */
-InnerView* ScintillaCocoa::ContentView()
-{
-  return static_cast<InnerView*>(wMain.GetID());
+SCIContentView* ScintillaCocoa::ContentView()
+{
+  return static_cast<SCIContentView*>(wMain.GetID());
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1510,7 +1510,7 @@
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Paint the margin into the MarginView space.
+ * Paint the margin into the SCIMarginView space.
  */
 void ScintillaCocoa::PaintMargin(NSRect aRect)
 {
@@ -1595,7 +1595,7 @@
 
 bool ScintillaCocoa::SetScrollingSize(void) {
 	bool changes = false;
-	InnerView *inner = ContentView();
+	SCIContentView *inner = ContentView();
 	if (!enteredSetScrollingSize) {
 		enteredSetScrollingSize = true;
 		NSScrollView *scrollView = ScrollContainer();
@@ -1927,7 +1927,7 @@
   // Drop input composition.
   NSTextInputContext *inctxt = [NSTextInputContext currentInputContext];
   [inctxt discardMarkedText];
-  InnerView *inner = ContentView();
+  SCIContentView *inner = ContentView();
   [inner unmarkText];
   Editor::SetDocPointer(document);
 }