#2 - Changed format of function names and names of params