Fixing Entity names.