Better naming of my stuff