Minor cleanup
Update package name