fix some names and adapt to fixed PARENTCALL