classes and packages renamed