Reorganise some of the ACT names & snippets