Remove unnecessary "Gateway" from name