Property naming for Issue #64