Proper handling of input names