more sed renaming of variables + functions