Internal arguments names amended.