fix package name scheme