Removed whitespace
Update to get all the changes from Jean-Luc
Adapt ty notebook to match new names