Rename shorten name and add test