Changed casing and naming to be more consistent