renamed variables and constants