TF3 Stop Naming Fix