rename variables
rename util functions