Added net.IP conversion
Improved renaming of identifiers