Minor rename
Fixed mock jdk