Change module name and filter to respect the naming convention
[FIX][Issue] #1