Fix incorrect property names
Add better identifier groupings