Changed imports to match renaming in previous commit