For #28, fixed names of functions and variables