Another minor modification/name change