consistent deprecation messages
Merge pull request #1451 from qwcode/deprecations

consistent deprecation messages