added checks for name values