Switching to short import name and explicit dependency fetch.