Restore old tag names and layout symbols