Rename member for consistency with its non-const-ness
Add make.platform abstraction