Rename internal properties. Fix #59