Portability: rename some str_class members