Revert "Revert "renaming fix""

This reverts commit 35a4ec6c5aed1d0327c3716fbddaa8e97bc1a8a5.