Fixed classes name issue By is written by