Change AML fields to correct module

Merged Jose Luis Zanotti requested to merge Fix into 12.0

Merge request reports