Update package name, and formatting