diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d3c05ce818fc033685330720d6c6138837a5eae..d6f679bb96ff7c3129443fa54916a97bdc823d99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,24 +28,24 @@ include_directories(${PROJECT_SOURCE_DIR}/include)
 # Locate sources and headers for this project
 # NB: headers are included so they will show up in IDEs
 #
-set(PROJECT_SRC 
+set(PROJECT_SRC
 
-     src/B1ActionInitialization.cc
-     src/B1DetectorConstruction.cc
-     src/B1EventAction.cc
-     src/B1PrimaryGeneratorAction.cc
-     src/B1RunAction.cc
-     src/B1SteppingAction.cc
+     src/ActionInitialization.cc
+     src/DetectorConstruction.cc
+     src/EventAction.cc
+     src/PrimaryGeneratorAction.cc
+     src/RunAction.cc
+     src/SteppingAction.cc
 )
 
-set(PROJECT_HEADER 
-include/B1ActionInitialization.hh
-include/B1DetectorConstruction.hh
-include/B1EventAction.hh
-include/B1PrimaryGeneratorAction.hh
-include/B1RunAction.hh
-include/B1SteppingAction.hh
-include/B1Analysis.hh
+set(PROJECT_HEADER
+include/ActionInitialization.hh
+include/DetectorConstruction.hh
+include/EventAction.hh
+include/PrimaryGeneratorAction.hh
+include/RunAction.hh
+include/SteppingAction.hh
+include/Analysis.hh
 )
 
 #----------------------------------------------------------------------------
@@ -60,8 +60,8 @@ target_link_libraries(cosmic_rays ${Geant4_LIBRARIES})
 # relies on these scripts being in the current working directory.
 #
 set(EXAMPLEB1_SCRIPTS
-  exampleB1.in
-  exampleB1.out
+
+  
   init_vis.mac
   run1.mac
   run2.mac
@@ -81,5 +81,3 @@ endforeach()
 # Install the executable to 'bin' directory under CMAKE_INSTALL_PREFIX
 #
 install(TARGETS cosmic_rays DESTINATION bin)
-
-
diff --git a/cosmic_rays.cc b/cosmic_rays.cc
index a5d314a2b0f690ca7f0b820359fbb7317e834ee9..2c7377b7a9476c1c8e8c44c44c27be915b519daa 100644
--- a/cosmic_rays.cc
+++ b/cosmic_rays.cc
@@ -27,8 +27,8 @@
 /// \file exampleB1.cc
 /// \brief Main program of the B1 example
 
-#include "B1DetectorConstruction.hh"
-#include "B1ActionInitialization.hh"
+#include "DetectorConstruction.hh"
+#include "ActionInitialization.hh"
 
 #ifdef G4MULTITHREADED
 #include "G4MTRunManager.hh"
@@ -71,7 +71,7 @@ int main(int argc,char** argv)
   // Set mandatory initialization classes
   //
   // Detector construction
-  runManager->SetUserInitialization(new B1DetectorConstruction());
+  runManager->SetUserInitialization(new DetectorConstruction());
 
   // Physics list - FTFP_BERT - p/shower
   // added verbose to the physics list
@@ -80,7 +80,7 @@ int main(int argc,char** argv)
   runManager->SetUserInitialization(physicsList);
     
   // User action initialization
-  runManager->SetUserInitialization(new B1ActionInitialization());
+  runManager->SetUserInitialization(new ActionInitialization());
   
   // Initialize visualization
   // (if you don't want the image, just delete the G4VisManager objetc and everything that concerns it)