Updated for Cisco behaviour table, re-shuffle table names