Fix wording + use underscores