Remove snake_case module names due to file name
Update package name on usage