Removed references to "main", use package name instead.