Change names to things that are hopefully more idiomatic