Revert package names back to normal again