Changed URL and added name check.