Better naming fix

Did a new pull request