Updated class and package name