Added D6 case, fixed wrong D3 name