Change the names of the variable holding the library name
Add the CD and IM modules