some id and string renaming from b08e2730 was reverted, those parts of the changes are reapplied here
