Update table names to singular
Make compatible with relative path