Renaming deprecated methods because the automated test framework doesn't like multipl...