GG-9178 Rename
GG-9178 Raname
GG-9178 Fixed notes from Yakov