GG-9375 rename