Controls renamed and fixed