...
Fixes to earlier refactoring (of JDK -> Jdk for consistency)