rename stuff

companion to cyclus/cyclus#773