Change structure

Changed naming structure to be consistent. My bad!