rename activities, add soap classes