Controls renamed to more readable shortened names