Added back validation for names in POC