-Cleanup: name variables in function prototypes