Add Module Name for Function Definitions

The Function Definitions passed to the solver currently is a pair of local name and the definition itself, this issue shell

• move the name into the definition
• add the module to the definition