JAL-4059 rename vars to j2s_ this and that for clarity