rename descriptor global functions appropriately