Update to 2.9.2: fix some names and delete some unused files