Change Action attribute names and refactor award and action assignment