Version:1.8x
Issue: when the entity name and the block name are the same it keeps both. Have a blacklist of blocks that it won't use the entity name for.

Also have if the name is the same for the entity remove it's first instance and if it doesn't work for everybody use the blacklist