Rename a few missed pieces