Better namespace name scheme