Name changes for readability