Update various function names for referee