Renamed "browser" and "gfx" to fit convention