Name guessing more robust

Signed-off-by: Paul <paul@doola.co.nz>