Change dashes to underscores for better consistency