[master] Shorten name