Renamed all Handlers with a Handler-suffix and also found two bugs after the adapter rename fix