pacakge rename in stun, some notes and cleanup