Changed file names to be AIO specific