Change package name to follow conventions