Rename internal fields