Rename compatibility layer to use underscore guards for consistency with internal layer.