Will EB2 use the same system of Cities and Castles in M2TW?

If so what changes will it bring? New names? New defenses? What features?