Yet another rename and struct encapsulation