Tweak binding names