Naming inconsistent - component vs. module

We should decide on what to use an stick to it.