Added hyphen as acceptable name character