Renaming packages for some standardization.