Switched to new package name, prepared for resolvers implementations.