Rename in preparation for OS agnostic capability