Cleanup of C variable naming