fix jpi failure
refactor names