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

Fix the build