Implement modules case issues fix.
Rollback case issues modules names.