Updated Entity Table Names;