Modified name strings to match classnames.