Some cleanup and renaming of calls