Add aliases for easier cherry-picking