Change package name to include underscores