So we should replace them in the other places... will be an API change.