Fix some JVM/CLR name discrepancies