Changed internal classes names