Replace ChoiceField type_label
Merge pull request #1619 from khamaileon/master

Replace ChoiceField type_label