more org.name -> org.slug fixes