rename classes & fix issue 2