Package naming restored