House Keeping

Changed a few variable and function names to adhere to coding standards.