Improved renaming

by Ilya Mesheryakov