rename some established labels before theyre set in stone

if this stuff doesn't get sorted now it might never happen