Rename mappings to properties maintaining BC

Fixes #407