Better Function Names
* Fixed up some functions names