Renaming and new AA algo.