Fixed code style
Small naming changes