Updated references to packages and classes