evaluate stuff for renaming to capture more cases

fixes #208
1.1.0-beta10