more naming style corrections