Correct function names, change default arg values