Fixed #9 Field name message refactored to type