Fixes #100 rename refactor support broken