adjusted table names