opt/j2re and opt/j2sdk renamed