Fixed problem with table names and hbm files