There is an ideological difference between the libre software movement and open source movement. The Free Software Foundation representatives have a different philosphy, different values, different goals and views to that of the Open source initiative though sometimes they work together on practical projects. The Free Software movement and the Open Source movement are like two political camps within the free software community.
Libre knowledge includes copyrighted works whose licenses honor and uphold the freedoms to use, redistribute, improve, and share the content. Libre knowledge requires libre and open document file formats so as not to exclude anyone and to ensure access. Wikipedia is a good example of libre knowledge.
You will need to decide on the terminolgy you will use for discussing and writing about libre software and libre knowledge during the course.