CXX-319 more meaningful names