More hardcoded table names #541