Changed names of AM and Client classes
Changed names of AM and Client classes