Silence deprecation warning for 1.7+

As of 1.7, a number of inconsistently named modules have been moved.