Changed the name of few things
New Changes