renamed packages and classes to english terms