diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt
index a9d0c3fcf142f..51bf41816821e 100644
--- a/devices/CMakeLists.txt
+++ b/devices/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_subdirectory (flp2epn)
 add_subdirectory (flp2epn-dynamic)
 add_subdirectory (flp2epn-distributed)
-add_subdirectory (alicehlt)
+add_subdirectory (aliceHLTwrapper)
diff --git a/devices/alicehlt/.gitignore b/devices/aliceHLTwrapper/.gitignore
similarity index 100%
rename from devices/alicehlt/.gitignore
rename to devices/aliceHLTwrapper/.gitignore
diff --git a/devices/alicehlt/AliHLTDataTypes.h b/devices/aliceHLTwrapper/AliHLTDataTypes.h
similarity index 100%
rename from devices/alicehlt/AliHLTDataTypes.h
rename to devices/aliceHLTwrapper/AliHLTDataTypes.h
diff --git a/devices/alicehlt/AliHLTHOMERData.h b/devices/aliceHLTwrapper/AliHLTHOMERData.h
similarity index 100%
rename from devices/alicehlt/AliHLTHOMERData.h
rename to devices/aliceHLTwrapper/AliHLTHOMERData.h
diff --git a/devices/alicehlt/AliHLTHOMERReader.h b/devices/aliceHLTwrapper/AliHLTHOMERReader.h
similarity index 100%
rename from devices/alicehlt/AliHLTHOMERReader.h
rename to devices/aliceHLTwrapper/AliHLTHOMERReader.h
diff --git a/devices/alicehlt/AliHLTHOMERWriter.h b/devices/aliceHLTwrapper/AliHLTHOMERWriter.h
similarity index 100%
rename from devices/alicehlt/AliHLTHOMERWriter.h
rename to devices/aliceHLTwrapper/AliHLTHOMERWriter.h
diff --git a/devices/alicehlt/CMakeLists.txt b/devices/aliceHLTwrapper/CMakeLists.txt
similarity index 96%
rename from devices/alicehlt/CMakeLists.txt
rename to devices/aliceHLTwrapper/CMakeLists.txt
index b132959036bc6..b473637df80f0 100644
--- a/devices/alicehlt/CMakeLists.txt
+++ b/devices/aliceHLTwrapper/CMakeLists.txt
@@ -2,7 +2,7 @@ set(INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${ZMQ_INCLUDE_DIR}
   ${Boost_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/devices/alicehlt
+  ${CMAKE_SOURCE_DIR}/devices/aliceHLTwrapper
 )
 
 include_directories(${INCLUDE_DIRECTORIES})
diff --git a/devices/alicehlt/Component.cxx b/devices/aliceHLTwrapper/Component.cxx
similarity index 100%
rename from devices/alicehlt/Component.cxx
rename to devices/aliceHLTwrapper/Component.cxx
diff --git a/devices/alicehlt/Component.h b/devices/aliceHLTwrapper/Component.h
similarity index 100%
rename from devices/alicehlt/Component.h
rename to devices/aliceHLTwrapper/Component.h
diff --git a/devices/alicehlt/HOMERFactory.cxx b/devices/aliceHLTwrapper/HOMERFactory.cxx
similarity index 100%
rename from devices/alicehlt/HOMERFactory.cxx
rename to devices/aliceHLTwrapper/HOMERFactory.cxx
diff --git a/devices/alicehlt/HOMERFactory.h b/devices/aliceHLTwrapper/HOMERFactory.h
similarity index 100%
rename from devices/alicehlt/HOMERFactory.h
rename to devices/aliceHLTwrapper/HOMERFactory.h
diff --git a/devices/alicehlt/README b/devices/aliceHLTwrapper/README
similarity index 98%
rename from devices/alicehlt/README
rename to devices/aliceHLTwrapper/README
index 3f72e150421dc..8d1460d61fd3a 100644
--- a/devices/alicehlt/README
+++ b/devices/aliceHLTwrapper/README
@@ -25,7 +25,7 @@ d) set up development clone
    git remote add --no-tags matthias gitolite@git.uio.no:u/mrichter/FairRoot
    git remote update matthias
    git branch --track alicehlt remotes/matthias/alicehlt
-   git checkout alicehlt # code can be found in example/alicehlt
+   git checkout alicehlt # code can be found in devices/aliceHLTwrapper
    make install # in the build directory
 
 
diff --git a/devices/alicehlt/SystemInterface.cxx b/devices/aliceHLTwrapper/SystemInterface.cxx
similarity index 100%
rename from devices/alicehlt/SystemInterface.cxx
rename to devices/aliceHLTwrapper/SystemInterface.cxx
diff --git a/devices/alicehlt/SystemInterface.h b/devices/aliceHLTwrapper/SystemInterface.h
similarity index 100%
rename from devices/alicehlt/SystemInterface.h
rename to devices/aliceHLTwrapper/SystemInterface.h
diff --git a/devices/alicehlt/WrapperDevice.cxx b/devices/aliceHLTwrapper/WrapperDevice.cxx
similarity index 100%
rename from devices/alicehlt/WrapperDevice.cxx
rename to devices/aliceHLTwrapper/WrapperDevice.cxx
diff --git a/devices/alicehlt/WrapperDevice.h b/devices/aliceHLTwrapper/WrapperDevice.h
similarity index 100%
rename from devices/alicehlt/WrapperDevice.h
rename to devices/aliceHLTwrapper/WrapperDevice.h
diff --git a/devices/alicehlt/aliceHLTWrapper.cxx b/devices/aliceHLTwrapper/aliceHLTWrapper.cxx
similarity index 100%
rename from devices/alicehlt/aliceHLTWrapper.cxx
rename to devices/aliceHLTwrapper/aliceHLTWrapper.cxx
diff --git a/devices/alicehlt/createLaunchCommands.sh b/devices/aliceHLTwrapper/createLaunchCommands.sh
similarity index 100%
rename from devices/alicehlt/createLaunchCommands.sh
rename to devices/aliceHLTwrapper/createLaunchCommands.sh
diff --git a/devices/alicehlt/macros/hltConfigurations.C b/devices/aliceHLTwrapper/macros/hltConfigurations.C
similarity index 100%
rename from devices/alicehlt/macros/hltConfigurations.C
rename to devices/aliceHLTwrapper/macros/hltConfigurations.C
diff --git a/devices/alicehlt/runComponent.cxx b/devices/aliceHLTwrapper/runComponent.cxx
similarity index 100%
rename from devices/alicehlt/runComponent.cxx
rename to devices/aliceHLTwrapper/runComponent.cxx