This is a "names" question. There are two standard directions of generalization of the Riemann hypothesis: one to L-functions (which is used quite a bit in analytic number theory, and for extending density results for primes to Dirichlet primes) and another to Dedekind zeta-functions. Wikipedia says that the version for L-functions is called the GRH and the version of zeta-functions is called the ERH, and other generalizations are called the GRH. But I have seen conflicting terminology in some books and papers, which refer to the L-function version as the ERH and the other version as the GRH.
Which is the more standard convention?