MDL-38147 rename functions starting with _