Hmm, this probably isn't needed and is handled by the rename below too right?
(Otoh, I don't think it hurts either?)