Use the full name as the short name (bug 1090324). r=gavin

--HG--
extra : rebase_source : a5e6721a8ef53f611e36747c5ef3a7cec01f9f35