Name function more appropriately