Revert "Replacing hyphens with underscores for field-type class"

This reverts commit eee504108763230226d83cc4613fb4b0f944f3cd.