More correction of over-zealous word replace