Renaming package name due to conventions