renamed table and models based on AR naming conventions