Major refactor: have dropped the stupid jw_* name-scheme