Update all function names to something shorter