renamed functions and variables
Merge pull request #53 from darkowlzz/rename

renamed functions and variables