Changed Function Names
* Compliance with naming standard