Fix merge conflicts and changed
module names to be more clear