Rename mappings to properties maintaining BC

Fixes #407
Merge pull request #583 from merk/rename-mappings

Rename mappings to properties maintaining BC