change line 73 to reflect current names