clean up pcity data naming conventions