fish: improve abbreviations