going back to package names with underscores