Name Changes

Just changed a few names match the lowercase, underscore separated
naming style...as pointed out in the code review.