Small naming refacto.