(Bug 5179) Standardize new prop names