Remove confusing variables in function signatures in files