Free software and open source are different marketing strategies for the same concept. The most commonly understood meaning for both terms is the same, from the very moment the Open Source Initiative was created.