OpenID Connect – Buttons

Two questions on the OpenID Connect Module (together with OpenID Connect SSO).

1. How do I change the text of the generic button? I have tried to create a modified connected client replacing “generic” with my name in the .class and .inc files but my website will not show these changes and just removes the option completely.
2. When I enable my OpenID Connect login (which redirects to my site) I can no longer use the normal login process (username/password) as that login button also redirects to my website. I would like to have both login methods available. Is this possible?

Thanks,
Keith

Drupal version: 


Source: https://www.drupal.org/taxonomy/term/4/feed