Macro'd and renamed all the relations and state designations--first pass