Name changes for readability

[ci skip]