Weird renaming issue that I'm trying to fix