Move fields
Rename internal equals method