Changed 23 Tables to match mangos format