Rename all the internal things aswell