Get rid of "scion" in classes and packages when not relevant