change IDs to a more formalized naming convention