Refactor use Entity#name_underscore

And remove redundant `entity_name_underscore`