Use defined names for SRW diagnostics