fix syntax
rename functions