fix package naming convention
