gompi is written this way, too.  Should I change both?