Add abbreviations and aliases
merge