replace deprecated references
4 files changed