Change package names to avoid using '_' in package names