more fixes associated with name changing