Bugfixes for friendly item naming system