Change package name to conform to standards