Renamed actions per public-vocabs discussion; Added EmployeeRole (3rd time's a charm)