Name changes for clarity