#4137 Improve naming