Rename internal vars to private