Change in table names, using pathways instead of pathway

This way the table names are in line with the ETL scripts
An additional change in table names