Updated package names

Removed redundant bits out of package names