Fix reset relatedEps before renaming (itofzo)