diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7611489510..bfeaac5026 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,11 +41,11 @@ option( KICAD_SCRIPTING_WXPYTHON
     "Build wxPython implementation for wx interface building in Python and py.shell (default OFF)."
     )
 
-option( USE_SCH_IO_MANAGER
+option( KICAD_USE_SCH_IO_MANAGER
     "Build Eeschema with the I/O manager for handling schematic and symbol library I/O. (default OFF)"
     )
 
-option( USE_OCE
+option( KICAD_USE_OCE
     "Build tools and plugins related to OpenCascade Community Edition (default OFF)"
     )
 
@@ -520,7 +520,7 @@ if( KICAD_SPICE )
 endif()
 
 # Find OpenCascade Community Edition, required for STEP plugin and tools
-if( USE_OCE )
+if( KICAD_USE_OCE )
     set( LIBS_OCE TKBinXCAF TKPCAF TKSTEP TKXDESTEP TKIGES TKXDEIGES )
 
     find_package( OCE 0.16 REQUIRED ${LIBS_OCE} )
diff --git a/Documentation/development/compiling.md b/Documentation/development/compiling.md
index fd441e0f91..ac4824eef7 100644
--- a/Documentation/development/compiling.md
+++ b/Documentation/development/compiling.md
@@ -154,11 +154,17 @@ The KICAD_SPICE option is used to control if the Spice simulator interface for e
 this option is enabled, it requires [ngspice][] to be available as a shared library.  This option is
 disabled by default.
 
-## STEP and IGES model support ## {#oce_opt}
+## New schmatic file format ## {#sch_io_mgr_opt}
 
-The KICAD_USE_OCE option is used to enable STEP and IGES model support for the 3d viewer. When enabled
-this requires the location of the installed OCE libary to be passed via the OCE_DIR flag. This option is
-disabled by default.
+The KICAD_USE_SCH_IO_MANAGER option is used to control if the new Eeschema I/O manager for handling
+schematic and symbol library I/O is enabled. This option is disabled by default.
+
+## STEP/IGES support for the 3D viewer ## {#oce_opt}
+
+The KICAD_USE_OCE is used for the 3D viewer plugin to support STEP and IGES 3D models. Build tools
+and plugins related to OpenCascade Community Edition (OCE) are enabled with this option. When
+enabled it requires [OCE][] to be available, and the location of the installed OCE libary to be
+passed via the OCE_DIR flag. This option is disabled by default.
 
 # Getting the KiCad Source Code ## {#getting_src}
 
diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp
index 4663cf5efd..f2721ba5c8 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@@ -715,7 +715,7 @@ PART_LIB* PART_LIB::LoadLibrary( const wxString& aFileName ) throw( IO_ERROR, bo
 
     wxString errorMsg;
 
-#ifdef USE_SCH_IO_MANAGER
+#ifdef KICAD_USE_SCH_IO_MANAGER
     SCH_PLUGIN::SCH_PLUGIN_RELEASER pi( SCH_IO_MGR::FindPlugin( SCH_IO_MGR::SCH_LEGACY ) );
 
     wxArrayString tmp;
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 9d49a9c500..d2c151fd32 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -110,7 +110,7 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SCREEN* aScreen, bool aSaveUnderNewName,
     wxLogTrace( traceAutoSave,
                 wxT( "Saving file <" ) + schematicFileName.GetFullPath() + wxT( ">" ) );
 
-#ifdef USE_SCH_IO_MANAGER
+#ifdef KICAD_USE_SCH_IO_MANAGER
         SCH_PLUGIN::SCH_PLUGIN_RELEASER pi( SCH_IO_MGR::FindPlugin( SCH_IO_MGR::SCH_LEGACY ) );
 
         try
@@ -315,7 +315,7 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
     }
     else
     {
-#ifdef USE_SCH_IO_MANAGER
+#ifdef KICAD_USE_SCH_IO_MANAGER
         delete g_RootSheet;   // Delete the current project.
         g_RootSheet = NULL;   // Force CreateScreens() to build new empty project on load failure.
 
diff --git a/plugins/3d/CMakeLists.txt b/plugins/3d/CMakeLists.txt
index 5cd00fefe9..873899691a 100644
--- a/plugins/3d/CMakeLists.txt
+++ b/plugins/3d/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory( idf )
 add_subdirectory( vrml )
 
-if( USE_OCE )
+if( KICAD_USE_OCE )
     add_subdirectory( oce )
-endif( USE_OCE )
+endif( KICAD_USE_OCE )