rename many variables structures and functions, adjust RPT output of buddy module