renamings and tweaks in w2