Fixing the table naming from entity where the code was adding an s to the already pre-defined table names.