[backport] Removed hyphens from files and classes