Re: dinput: Fix name clashes (Resend #2)