Merge "Arranging name of gateway parameter"