both forms are ok because ukrainian sound cannot be precisely transliterated to english g but from the official point of view you are right heroyam more accurate