Make variable names more consistent with Go style