fix package name and formatting