Made the naming of these assign parameters slightly more consistent