CONN-1284: Renamed files to use proper name and fixed one MTOM issue..