Support repo key for backwards compatibility.
Improve deprecation warnings for unused keys