Module renaming

@fb3rasp Can you have a look at this PR?