Fix method names to match gm_name