Some camel case rename and state initialisation