Improving some name to understand better