Revert "renaming fix"

This reverts commit dee4956a23bfe1b5e6ac2ad03426cfad54b7ee61.