Updated casing and naming