issue: 2446 Renaming function instances, definition and declaration as final efforts of harmonizing