Change coordinateProviderCapability to coordinateProvider and transitive changes