Making locateRfromRegistry a function again to avoid registry lookup overhead and some renaming