Naming improvements for #26