Fixed tables namespace collision