Structure changes

Changed names to better reflect their purpose.