Remove '-extra-' from package name.