Edit function names

I edited function names so that they start with an uppercase
Change function names

I first started to make function names start with uppercase then was
told that we are not there yet, then i took them to the way they were