Include renames when instantiating
Merge pull request #82 from orien/fix_build

Fix the build
Merge remote-tracking branch 'lhm/master' into add_trigger

merge in a green master