Fixes CLI alias overlaps