updated kauha hierarcy and naming,