change package name to follow naming conventions