Adding support for name via forked plugin