Modified the name of some tables to closely match their schema