Fixed: Renamed items should now take precedence over item naming