Minor var naming changes
Update Jedi to latest upstream dev branch