Renaming packages to remove camel case to avoid Mac Git issues.