Re-add ELS shortnames (54c20b0bb67c).

It seems a merge reverted 54c20b0bb67c.