misc name changes etc etc