Rename some stuff to avoid certain errors.