Rename from AAM to ADAM is complete
Clean up the converter code