Modified proxy to use more generic name