Renaming packages to conform with appropriate naming conventions