Change to SDL-style naming scheme