Revert "hacky rename function"

This reverts commit a2182c36234300085ea5dfcd77e790e1161030fe.