diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java
index 700508c14b2..52084e52166 100644
--- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java
+++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java
@@ -39,7 +39,7 @@ public class WinCEConnectorService extends BasicConnectorService implements IRap
   
   protected void internalConnect(IProgressMonitor monitor) throws Exception {
     fireCommunicationsEvent(CommunicationsEvent.BEFORE_CONNECT);
-    Rapi.CoInitializeEx(0, Rapi.COINIT_MULTITHREADED);
+    Rapi.initialize(Rapi.COINIT_MULTITHREADED);
     desktop = IRapiDesktop.getInstance();
     enumDevices = desktop.enumDevices();
     device = enumDevices.next();
diff --git a/wince/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/RapiExamples.java b/wince/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/RapiExamples.java
index 268214ad19f..cd6480a9831 100644
--- a/wince/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/RapiExamples.java
+++ b/wince/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/RapiExamples.java
@@ -37,7 +37,7 @@ public class RapiExamples {
 	 * Initialize the underlying natives.
 	 */
 	public void initRapi() {
-	  Rapi.CoInitializeEx(0, Rapi.COINIT_MULTITHREADED);
+	  Rapi.initialize(Rapi.COINIT_MULTITHREADED);
 	}
 
 	/**
@@ -56,7 +56,7 @@ public class RapiExamples {
 		if (session != null) {
 			session.release();
 		}
-		Rapi.CoUninitialize();
+		Rapi.uninitialize();
 	}
 
 	/**
diff --git a/wince/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiTestCase.java b/wince/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiTestCase.java
index e2f4033f048..ec2d494045a 100644
--- a/wince/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiTestCase.java
+++ b/wince/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiTestCase.java
@@ -31,7 +31,7 @@ public class RapiTestCase extends TestCase {
     enumDevices = null;
     device = null;
     session = null;
-    Rapi.CoInitializeEx(0, Rapi.COINIT_MULTITHREADED);
+    Rapi.initialize(Rapi.COINIT_MULTITHREADED);
   }
 
   protected void tearDown() throws Exception {
@@ -48,7 +48,7 @@ public class RapiTestCase extends TestCase {
     if (session != null) {
       session.release();
     }
-    Rapi.CoUninitialize();
+    Rapi.uninitialize();
   }
 
 }
diff --git a/wince/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/Rapi.java b/wince/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/Rapi.java
index ca820c601f8..c45f866b467 100644
--- a/wince/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/Rapi.java
+++ b/wince/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/Rapi.java
@@ -81,16 +81,16 @@ public final class Rapi {
   public static final int COINIT_SPEED_OVER_MEMORY = 0x8;
 
   /**
-	 * Initializes the library, the clients must call this method before any
-	 * other. The meaning of the <code>init</code> parameter and the returned
-	 * value is platform dependent. On Win32 platforms this method is directly
-	 * mapped to <code>CoInitializeEx</code>.
-	 *
-	 * @param init on Win32 it is either {@link #COINIT_APARTMENTTHREADED} or
-	 *            {@link #COINIT_MULTITHREADED}
-	 * @return on Win32 this is the returned value from
-	 *         <code>CoInitializeEx</code>
-	 */
+   * Initializes the library, the clients must call this method before any
+   * other. The meaning of the <code>init</code> parameter and the returned
+   * value is platform dependent. On Win32 platforms this method is directly
+   * mapped to <code>CoInitializeEx</code>.
+   *
+   * @param init on Win32 it is either {@link #COINIT_APARTMENTTHREADED} or
+   *            {@link #COINIT_MULTITHREADED}
+   * @return on Win32 this is the returned value from
+   *         <code>CoInitializeEx</code>
+   */
   public static final int initialize(int init) {
   	return CoInitializeEx(0, init);
   }
@@ -106,21 +106,21 @@ public final class Rapi {
   /**
    * Initializes the COM library.
    */
-  public static final native int CoInitializeEx(int pvReserved, int dwCoInit);
+  static final native int CoInitializeEx(int pvReserved, int dwCoInit);
 
   /**
    * Closes the COM library on the current thread.
    */
-  public static final native void CoUninitialize();
+  static final native void CoUninitialize();
 
   /**
-	 * Sets the first element of the specified array with the address of a newly
-	 * instantiated <code>IRAPIDesktop</code> native interface.
-	 * 
-	 * @param pIRAPIDesktop an array with one element
-	 * @return {@link #NOERROR} if the function succeeds; otherwise an error
-	 *         code
-	 */
+   * Sets the first element of the specified array with the address of a newly
+   * instantiated <code>IRAPIDesktop</code> native interface.
+   * 
+   * @param pIRAPIDesktop an array with one element
+   * @return {@link #NOERROR} if the function succeeds; otherwise an error
+   *         code
+   */
   final static native int CreateRapiDesktop(int[] pIRAPIDesktop);