unify jf props

Change-Id: I4f0ba1495aa772913814023ba7f80672a16e9736