Remove hyphens and underscores from Pc name