rename var, fix history ..