finish rename (fix #2)