More name changes, etc.