DIAG: be more consistent about Diag constructor parameter naming