Minor fix & name update