diff --git a/org.eclipse.help.ui/Eclipse Help UI/HelpWorkbench.properties b/org.eclipse.help.ui/Eclipse Help UI/HelpWorkbench.properties
deleted file mode 100644
index bf340d6..0000000
--- a/org.eclipse.help.ui/Eclipse Help UI/HelpWorkbench.properties
+++ /dev/null
@@ -1,123 +0,0 @@
-# =============================================
-# Eclipse Help System Workbench Properties File
-# =============================================
-
-# Part 1. (DO NOT TRANSLATE Part 1)
-# These are the non-translatable properties.
-# -----------------------------------------
-resynch_icon = resynch.gif
-home_icon = home.gif
-back_icon= back.gif
-forward_icon = forward.gif
-printer_icon = printer.gif
-copy_icon = copy.gif
-hidenav_icon = hidenav.gif
-actions_icon = actions.gif
-go_icon= go.gif
-topic_icon = topic.gif
-topicfolder_icon = topicfolder.gif
-topicandfolder_icon = topicandfolder.gif
-moreImage = more.gif
-shellIcon = view.gif
-
-
-
-# Part 2. (DO TRANSLATE Part 2)
-# These are the translatable properties.
-# ------------------------------------------
-icons = icons
-copy = copy
-Copy_1 = Copy the Selection to the Clipboard
-home = home
-Home_page = Home Page
-back = back
-Previous_page = Back
-Show_TOC = Show Navigation
-Hide_TOC = Hide Navigation
-toggle = toggle
-synchronize = synchronize
-Synchronize_with_TOC = Synchronize Navigation
-forward = forward
-Next_page = Forward
-print = print
-Actions = Actions
-Print_page = Print Page
-Connecting_to = Connecting to
-Web_site_found = Web site found
-Finding_site = Finding site
-Javascript_called = Javascript called
-Search = Search
-Search_within_results = Search within results
-Search_headers_only = Search headings only
-Enter_search_string = Enter search string...
-Search_results = Search results
-No_results_found = No results found for your query.
-Results = Results 
-File = File 
-OR = OR
-NOT = NOT
-AND = AND
-Plugin = Plugin
-Advanced = Advanced ...
-Enable_Filtering = Enable filtering by:
-Disable_Filtering = Disable filtering
-Search_only_within = Search only within
-Context_Help = Context Help
-Related_Topics = Related Topics:
-Show_More_Related = More links ...
-No_more_links_exist = There are no more links.
-RelatedTopics_viewLabel = Related
-Help_Error = Help Error
-Help_Question = Help Question
-Help_Info = Help Information
-Errors_only = Errors only
-Warnings_and_errors = Warnings and errors
-Everything = Everything
-Installation_Options = Documentation is installed
-Local_install = Locally
-Client_only = Remotely on a server
-Local_server_config = Internal help server configuration
-Local_server_config_automatic = Automatic
-Local_server_config_manual = Manual
-Server_address = IP address:
-Server_port = Port:
-Server_path = Remote server URL:
-Browser_path = Browser path
-Print_Topic_Tree = &Print topic tree
-Printing_Topic_Tree = Printing topic tree...
-Printing= Printing: \n
-ok_To_Print = You are about to print %1 separate document(s).\nContinue?
-no_Topics_To_Print = There are no topics to print.
-Table_Of_Contents = Table Of Contents
-Advanced_Properties = Advanced
-Logging_Options = Logging options
-
-# Error Messages 
-# --------------
-WE001 = The Help System viewer could not be initialized.\n\
-	To display online documentation, the Help System requires \
-	Internet Explorer, version 5.01 or later.\n\
-	Please install or upgrade your current version of IE.
-WE002 = Could not create help system perspective. 
-WE003 = No help system perspective available.
-WE004 = Help system view could not be launched.
-WE005 = Errors encountered while launching the help system.
-WE006 = Could not perform nested print action.
-WE007 = Help View Failed to Launch.
-WE008 = Infoset %1 is not installed.
-
-# Warning Messages 
-# ----------------
-WW001 = It appears that documentation is not installed on this machine. \
-	If it is installed on a remote server, then from Window -> Preferences, \
-	select the Help page and configure the required parameters.
-WW002 = Context help not found.
-
-
-
-   
-
-
-	
-
-
diff --git a/org.eclipse.help.ui/Eclipse Help UI/helpworkbench.properties b/org.eclipse.help.ui/Eclipse Help UI/helpworkbench.properties
index 010feed..bf340d6 100644
--- a/org.eclipse.help.ui/Eclipse Help UI/helpworkbench.properties
+++ b/org.eclipse.help.ui/Eclipse Help UI/helpworkbench.properties
@@ -13,6 +13,7 @@
 copy_icon = copy.gif
 hidenav_icon = hidenav.gif
 actions_icon = actions.gif
+go_icon= go.gif
 topic_icon = topic.gif
 topicfolder_icon = topicfolder.gif
 topicandfolder_icon = topicandfolder.gif
@@ -45,8 +46,22 @@
 Web_site_found = Web site found
 Finding_site = Finding site
 Javascript_called = Javascript called
+Search = Search
+Search_within_results = Search within results
+Search_headers_only = Search headings only
+Enter_search_string = Enter search string...
+Search_results = Search results
+No_results_found = No results found for your query.
+Results = Results 
 File = File 
+OR = OR
+NOT = NOT
+AND = AND
 Plugin = Plugin
+Advanced = Advanced ...
+Enable_Filtering = Enable filtering by:
+Disable_Filtering = Disable filtering
+Search_only_within = Search only within
 Context_Help = Context Help
 Related_Topics = Related Topics:
 Show_More_Related = More links ...
diff --git a/org.eclipse.help.ui/Eclipse Help UI/org/eclipse/help/internal/ui/util/WorkbenchResources.java b/org.eclipse.help.ui/Eclipse Help UI/org/eclipse/help/internal/ui/util/WorkbenchResources.java
index 027fd82..dfaa13e 100644
--- a/org.eclipse.help.ui/Eclipse Help UI/org/eclipse/help/internal/ui/util/WorkbenchResources.java
+++ b/org.eclipse.help.ui/Eclipse Help UI/org/eclipse/help/internal/ui/util/WorkbenchResources.java
@@ -23,7 +23,7 @@
 	private static URL imageURL;
 
 	static {
-		resBundle = ResourceBundle.getBundle("HelpWorkbench", Locale.getDefault());
+		resBundle = ResourceBundle.getBundle("helpworkbench", Locale.getDefault());
 		try {
 			imageURL =
 				new URL(HelpSystem.getPlugin().getDescriptor().getInstallURL(), "icons/");
diff --git a/org.eclipse.help.ui/HelpContexts.xml b/org.eclipse.help.ui/HelpContexts.xml
deleted file mode 100644
index 5be6104..0000000
--- a/org.eclipse.help.ui/HelpContexts.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contexts>
-
-<!-- F1 on F1 -->
-   <context  id="f1Shell" >
-      <description>%f1Shell</description>
-   </context>
-
-<!-- not used, but picked up by most contexts -->
-   <context  id="embeddedHelpView" >
-      <description>%embeddedHelpView</description>
-   </context>
-
-<!-- Used on Linux only -->
-   <context  id="browser" >
-      <description>%browser</description>
-   </context>
-
-<!-- Information Set drop-down menu; inherited by things on the left-hand side  -->
-   <context  id="navigationViewer" >
-      <description>%navigationViewer</description>
-   </context>
-
-<!-- Navigation trees -->
-   <context  id="topicsViewer" >
-      <description>%topicsViewer</description>
-   </context>
-
-<!-- All Advanced Search window options -->
-   <context  id="advancedSearch" >
-      <description>%advancedSearch</description>
-   </context>
-
-<!-- Search field, Go button, Advanced button -->
-   <context  id="searchPage" >
-      <description>%searchPage</description>
-   </context>
-
-<!-- Search results tree; inherits searchPage, topicsViewer, embeddedHelpView -->
-   <context  id="resultsViewer" >
-      <description>%resultsViewer</description>
-   </context>
-
-<!-- Help page in preferences dialog, Default and Apply buttons -->
-   <context  id="prefPage" >
-      <description>%prefPage</description>
-   </context>
-
-<!-- Doc location group, including browser path -->
-   <context  id="installOptions" >
-      <description>%installOptions</description>
-   </context>
-
-<!-- Used on Linux only -->
-   <context  id="browserPath" >
-      <description>%browserPath</description>
-   </context>
-
-<!-- Logging options group -->
-   <context  id="loggingOptions" >
-      <description>%loggingOptions</description>
-   </context>
-
-<!-- Help server config group -->
-   <context  id="localServerConfig" >
-      <description>%localServerConfig</description>
-   </context>
-
-<!-- not used -->
-   <context  id="synchronizeAction" >
-      <description>%synchronizeAction</description>
-   </context>
-
-<!-- not used -->
-   <context  id="copyAction" >
-      <description>%copyAction</description>
-   </context>
-
-<!-- not used -->
-   <context  id="printAction" >
-      <description>%printAction</description>
-   </context>
-
-<!-- not used -->
-   <context  id="backAction" >
-      <description>%backAction</description>
-   </context>
-
-<!-- not used -->
-   <context  id="forwardAction" >
-      <description>%forwardAction</description>
-   </context>
-
-<!-- not used -->
-   <context  id="homeAction" >
-      <description>%homeAction</description>
-   </context>
-
-<!-- not used -->
-   <context  id="showHideAction" >
-      <description>%showHideAction</description>
-   </context>
-
-</contexts>
\ No newline at end of file
diff --git a/org.eclipse.help.ui/build.properties b/org.eclipse.help.ui/build.properties
index fd37107..6abb1ac 100644
--- a/org.eclipse.help.ui/build.properties
+++ b/org.eclipse.help.ui/build.properties
@@ -1,10 +1,10 @@
 # VAJ build contribution
-build.includes=icons,context.properties,HelpContexts.xml,plugin.jars,build.properties,plugin.properties,plugin.xml,pref_store.ini
+build.includes=icons,context.properties,contexts.xml,plugin.jars,build.properties,plugin.properties,plugin.xml,pref_store.ini
 build.vaj.Eclipse\ Help\ UI=Eclipse Help UI
 build.vaj.Eclipse\ Help\ UI\ Win32=Eclipse Help UI Win32
 build.vaj.Eclipse\ Help\ UI\ Motif=Eclipse Help UI Motif
 
 # Eclipse build contribution
 source.helpworkbench.jar=Eclipse Help UI,Eclipse Help UI Win32,Eclipse Help UI Motif
-bin.includes=icons/,context.properties,HelpContents.xml,plugin.xml,pref_store.ini,*.jar,plugin.properties
+bin.includes=icons/,context.properties,contents.xml,plugin.xml,pref_store.ini,*.jar,plugin.properties
 
diff --git a/org.eclipse.help.ui/plugin.xml b/org.eclipse.help.ui/plugin.xml
index f854a23..b5db23b 100644
--- a/org.eclipse.help.ui/plugin.xml
+++ b/org.eclipse.help.ui/plugin.xml
@@ -82,7 +82,7 @@
    <!-- Context Help contribution for this plugin  --> 
    <!-- ========================================== -->
    <extension point="org.eclipse.help.contexts"> 
-      <contexts name="HelpContexts.xml"/> 
+      <contexts name="contexts.xml"/> 
    </extension>
   
    <!-- Define the help menu action set -->
diff --git a/org.eclipse.help/Eclipse Help/Help.properties b/org.eclipse.help/Eclipse Help/Help.properties
deleted file mode 100644
index 999732f..0000000
--- a/org.eclipse.help/Eclipse Help/Help.properties
+++ /dev/null
@@ -1,108 +0,0 @@
-# ====================================
-# Eclipse Help System Properties File
-# ====================================
-
-# Part 1. (DO NOT TRANSLATE Part 1)
-# These are the non-translable properties.
-# -----------------------------------------
-CSS_location = html/default.css
-splash_location = html/default_home.html
-bold_tag_name = b
-notopic.html = html/notopic.html
-noresults.html = html/noresults.html
-
-
-# Part 2. (DO TRANSLATE Part 2)
-# These are the translable properties.
-# -----------------------------------------
-icons = icons
-contribution_accept = contribution accept
-Error_in_generating_navigation = Error in generating navigation : 
-host_ = host=%1
-address(es)_retrieved =  address(es) retrieved from this system.
-address_1 = address=%1
-Error = Error
-request = *** request:	
-url_1 =  url=
-Error_1 = Error 
-keyword = keyword
-within = within
-Search_Results = Search Results
-returned_no_matches = Your search returned no matches.
-index_is_busy = index is busy, try again in a few minutes
-User_assist_error = User assistance error: %1 %2
-Search_Engine_debug_messag = Search Engine debug message: %1
-_Millis_ =  Millis=
-User_assist_msg = User assistance logged message: %1 %2  
-Table = Table %1 has not been loaded.
-File4 = File %1 cannot be read.
-File = File 
-Exception_occured = Exception occured while saving table %1 to file %2.
-Expected = Expected: %1 but got: %2
-OR = OR
-NOT = NOT
-AND = AND
-Index_needs_updated = Updating documentation index.
-Preparing_for_indexing = Preparing for indexing ...
-Document1 = Document %1 cannot be read
-Indexing = Indexing: 
-Document2 = Document %1 cannot be indexed
-Writing_index = Writing index ...
-Plugin = Plugin 
-Searching_for = Searching documents for "%1" 
-Exception_copying = Exception while copying file from to file.
-Search_cancelled = Search cancelled
-Table2 = Table %1 cannot be saved to %2.
-topicNotAvailable = Error occured accessing the document.
-no_search_server = Document search could not be performed on the server.  The help server is not running or search is not installed.
-search_not_installed = Search not installed on the server.
-search_index_update_error = Search could not be performed, because an error has occured during update of index.
-Undoing_document_adds = Undoing canceled operation.
-Table_Of_Contents = Table Of Contents
-
-# Error Messages 
-# --------------
-E001 = Error parsing URL: %1 at Line:%2 Column:%3 %4
-E002 = Failed to parse URL: %1 at Line:%2 Column:%3 %4
-E003 = Warning parsing URL: %1 at Line:%2 Column:%3 %4
-E004 = Cannot read help configuration file %1
-E005 = Error in launching help.
-E006 = The following errors occurred:\n
-E007 = The following contribution files where ignored because of errors:\n
-E008 = Parser Errors:\n
-E009 = Error loading %1.
-E011 = No context information found for %1 plugin
-E012 = Could not copy the model data from server
-E013 = Could not copy the infoset data from server
-
-ES01 = Error closing index
-ES02 = Error creating index
-ES03 = Error deleting index
-ES04 = Error finishing update process of index
-ES05 = Error veryfing index
-ES06 = Error opening index
-ES07 = Error searching index
-ES08 = Error starting update process of index
-ES09 = Error adding document %1
-ES10 = Error aborting update process of index
-ES11 = Error unzipping prebuilt index
-
-EI01 = Cannot find the index directory: %1
-
-
-# Warning Messages 
-# ----------------
-WS01 = Warning adding document %1
-WS02 = Document model %1 could not be read.  Index will be created using the default model.
-WS03 = Help Action Contribution %1 could not be executed.
-
-W001= Problems reading product.ini file	
-
-
-# Info Messages 
-# -------------
-I001 = Remote Help System Log level = %1
-I002 = Help System started.
-I003 = Help System shutting down.
-I004 = begining search...
-
diff --git a/org.eclipse.help/Eclipse Help/help.properties b/org.eclipse.help/Eclipse Help/help.properties
index da42f47..999732f 100644
--- a/org.eclipse.help/Eclipse Help/help.properties
+++ b/org.eclipse.help/Eclipse Help/help.properties
@@ -12,11 +12,12 @@
 noresults.html = html/noresults.html
 
 
-# Part 2. (TRANSLATE Part 2)
+# Part 2. (DO TRANSLATE Part 2)
 # These are the translable properties.
 # -----------------------------------------
 icons = icons
 contribution_accept = contribution accept
+Error_in_generating_navigation = Error in generating navigation : 
 host_ = host=%1
 address(es)_retrieved =  address(es) retrieved from this system.
 address_1 = address=%1
@@ -30,16 +31,33 @@
 returned_no_matches = Your search returned no matches.
 index_is_busy = index is busy, try again in a few minutes
 User_assist_error = User assistance error: %1 %2
+Search_Engine_debug_messag = Search Engine debug message: %1
+_Millis_ =  Millis=
 User_assist_msg = User assistance logged message: %1 %2  
+Table = Table %1 has not been loaded.
 File4 = File %1 cannot be read.
 File = File 
 Exception_occured = Exception occured while saving table %1 to file %2.
 Expected = Expected: %1 but got: %2
+OR = OR
+NOT = NOT
+AND = AND
+Index_needs_updated = Updating documentation index.
+Preparing_for_indexing = Preparing for indexing ...
+Document1 = Document %1 cannot be read
+Indexing = Indexing: 
+Document2 = Document %1 cannot be indexed
+Writing_index = Writing index ...
 Plugin = Plugin 
+Searching_for = Searching documents for "%1" 
 Exception_copying = Exception while copying file from to file.
+Search_cancelled = Search cancelled
+Table2 = Table %1 cannot be saved to %2.
 topicNotAvailable = Error occured accessing the document.
+no_search_server = Document search could not be performed on the server.  The help server is not running or search is not installed.
 search_not_installed = Search not installed on the server.
 search_index_update_error = Search could not be performed, because an error has occured during update of index.
+Undoing_document_adds = Undoing canceled operation.
 Table_Of_Contents = Table Of Contents
 
 # Error Messages 
@@ -55,16 +73,30 @@
 E009 = Error loading %1.
 E011 = No context information found for %1 plugin
 E012 = Could not copy the model data from server
-E013 = Could not read the infosets data
-E014 = Error accessing file: %1
-E015 = Errors occured generating file: %1
-E016 = Could not parse infosets data
+E013 = Could not copy the infoset data from server
+
+ES01 = Error closing index
+ES02 = Error creating index
+ES03 = Error deleting index
+ES04 = Error finishing update process of index
+ES05 = Error veryfing index
+ES06 = Error opening index
+ES07 = Error searching index
+ES08 = Error starting update process of index
+ES09 = Error adding document %1
+ES10 = Error aborting update process of index
+ES11 = Error unzipping prebuilt index
+
+EI01 = Cannot find the index directory: %1
 
 
 # Warning Messages 
 # ----------------
+WS01 = Warning adding document %1
+WS02 = Document model %1 could not be read.  Index will be created using the default model.
+WS03 = Help Action Contribution %1 could not be executed.
+
 W001= Problems reading product.ini file	
-W002 = Help Action Contribution %1 could not be executed.
 
 
 # Info Messages 
diff --git a/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/util/Resources.java b/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/util/Resources.java
index f6c558e..f4ce235 100644
--- a/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/util/Resources.java
+++ b/org.eclipse.help/Eclipse Help/org/eclipse/help/internal/util/Resources.java
@@ -18,7 +18,7 @@
 public class Resources {
 	private static ResourceBundle resBundle;
 	static {
-		resBundle = ResourceBundle.getBundle("Help", Locale.getDefault());
+		resBundle = ResourceBundle.getBundle("help", Locale.getDefault());
 	}
 	/**
 	 * Resources constructort.
diff --git a/org.eclipse.help/doc/HelpSample.JPG b/org.eclipse.help/doc/HelpSample.JPG
deleted file mode 100644
index 6c0e208..0000000
--- a/org.eclipse.help/doc/HelpSample.JPG
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.help/doc/org_eclipse_help_contributions.html b/org.eclipse.help/doc/org_eclipse_help_contributions.html
index f3f3545..538f2dc 100644
--- a/org.eclipse.help/doc/org_eclipse_help_contributions.html
+++ b/org.eclipse.help/doc/org_eclipse_help_contributions.html
@@ -316,7 +316,7 @@
 <br>&nbsp;</blockquote>
 Here is the resulting documentation hierarchy in the Eclipse Workbench
 :
-<p><img SRC="HelpSample.JPG" height=431 width=803>
+<p><img SRC="helpsample.jpg" height=431 width=803>
 <br>&nbsp;
 <h4>
 Non-integrated components</h4>