Small naming changes
Fixed style cop