Namefixer updates

Uses less CPU resources now!