Rename aa to _aa