Bug: 12343 Fix property names.