FLUID-5581: Fixed the modelListener declaration

Chnaged from using funcName to listener
Merge remote-tracking branch 'justin/FLUID-5581'

* justin/FLUID-5581:
  FLUID-5581: Fixed the modelListener declaration