Updated due to naming changes in AWOT