Revert "Renamed FieldDefinition to BaseFieldDefinition"

This reverts commit 4b37e7bca42445f2d38798262883dbdbbf8c615c, in order to
follow certain API changes in chronological order.
Renamed FieldDefinition to BaseFieldDefinition