Made naming more consistent