Revert "  replace duplicate short name, with backward compatibility (#23)"

This reverts commit a723a5f55294d5bfe8348b9317b87f1c434c45ce.