Added upper-case function for names with hyphens