BS-7436, fix table names on persitence service