Name fixes for property list