Cleaned rename-induced mess...