Fix jdk and jre package names