Fixed the naming nominclature so now the function output
is also stored in the <function name>_output class instance.
Authored by: mshumko 2017-05-27
Parent: [r585]
Child: [r587]