Changed Primary Key Names

Updated the script so that the primary key names reflect the tables they
belong to.