Changed naming rule to allow underscores followed by a number.