There is a good blog post on modularity versus composionality. (If it were up to me I'd get mathematicians to define all technical terms. :P)