Upgrade whitespace to use scoped properties