naming and arguments for contr_equiv and trunc_equiv

The lemmas `contr_equiv_contr` and `trunc_equiv' were inconsistently named, and also inconsistent about which arguments were implicit.  I made them consistent, which necessitated changing a number of invocations throughout the library.