fixed #37: rename renames dynamic usages
fixed NPE