Revert "rename valid_key? to valid?, deprecated_key? to deprecated?"

This reverts commit 26a42a35fe8fac92ec6a30d12204c0da708f7735.