This naming seem "more correct"