Renamed the files to reflect AM file naming conventions.