Added more coherency to the naming scheme for AIs.