rename shader vars for consistency