Rename and camelcase variables