More name changes for clarity