Proper variable naming

Proper Naming conversion. Thanks to Rakshit