rename what we can, save algos for after march test