Fix nick clashes