Update function and parameter names from @aronasorman's feedback