WINDUP-222: Fixes, renaming etc.