Initial work on integrating the JDK ORB
More fixes
Fix some names