Initial Release of Shortnames

For reviewing the changes, do a: git diff e3440ff9fcbe863eb6cf00781401bcb4b625a64c 2a7baf3b8ccd9ebb799aa08202c8a07aa9ec3ce3