Changed names of classes to avoid clashes with samira