Edit naming conflicts on class/modules
Uncomment necessary code