Updated deprecated code references