Fix for names of argument lists