Changed names two classes