Change references from AM207