Improved Short-names