Rename and rescope everything, with demo to check