Fix spelling of Gateway
Change import to my fork