Post-renaming fixes