Bi-directional monkeypatch

This monkey patch works bidirectionally, so that sites can take the time to port over old code to new API names while having their site continue to work on engines that only support new names.