Update property names for identifiers

Fixes #159