Updated to match name changes in sdl2