Rename working now

Bleh, just handled manually