J: fixed naming issues