Re-added partial name support