Issue 1

Resolution found - old reference in legacy code
Usage of fixed table names