fix legacy names
5x boost with goto scanner