-Delete "$SMPROGRAMS\ossec\Edit.lnk"
-Delete "$SMPROGRAMS\ossec\Uninstall.lnk"
-Delete "$SMPROGRAMS\ossec\Documentation.lnk"
-Delete "$SMPROGRAMS\ossec\Edit Config.lnk"
-Delete "$SMPROGRAMS\ossec\*.*"
-
-; Remove directories used
-RMDir "$SMPROGRAMS\ossec"
-
-; Creating SMS directory
-CreateDirectory "$SMPROGRAMS\ossec"
-
-CreateShortCut "$SMPROGRAMS\ossec\Manage Agent.lnk" "$INSTDIR\win32ui.exe" "" "$INSTDIR\win32ui.exe" 0
-CreateShortCut "$SMPROGRAMS\ossec\Documentation.lnk" "$INSTDIR\doc.html" "" "$INSTDIR\doc.html" 0
-CreateShortCut "$SMPROGRAMS\ossec\Edit Config.lnk" "$INSTDIR\ossec.conf" "" "$INSTDIR\ossec.conf" 0
-CreateShortCut "$SMPROGRAMS\ossec\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-
-
-; Install in the services
+Rename "$INSTDIR\os_win32ui.exe" "$INSTDIR\win32ui.exe"
+Delete "$SMPROGRAMS\OSSEC\Edit.lnk"
+Delete "$SMPROGRAMS\OSSEC\Uninstall.lnk"
+Delete "$SMPROGRAMS\OSSEC\Documentation.lnk"
+Delete "$SMPROGRAMS\OSSEC\Edit Config.lnk"
+Delete "$SMPROGRAMS\OSSEC\*.*"
+
+; Remove start menu entry.
+RMDir "$SMPROGRAMS\OSSEC"
+
+; Creating start menu directory
+CreateDirectory "$SMPROGRAMS\OSSEC"
+CreateShortCut "$SMPROGRAMS\OSSEC\Manage Agent.lnk" "$INSTDIR\win32ui.exe" "" "$INSTDIR\win32ui.exe" 0
+CreateShortCut "$SMPROGRAMS\OSSEC\Documentation.lnk" "$INSTDIR\doc.html" "" "$INSTDIR\doc.html" 0
+CreateShortCut "$SMPROGRAMS\OSSEC\Edit Config.lnk" "$INSTDIR\ossec.conf" "" "$INSTDIR\ossec.conf" 0
+CreateShortCut "$SMPROGRAMS\OSSEC\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+
+; Install in the services (perhaps it would be better to use a plug-in here?)
+;nsExec::ExecToStack '"$INSTDIR\ossec-agent.exe" install-service'