Restructured namming conventions