namespace changed and some class names