Updating namecomplete

@troymccabe @bklang 
Is this 16% safe?