Small fix to shorts.
Fixed bug with name clash code.