Changed Name

Made a few changes to the code. Let me know what you think.