Merge "Rename cases to modules and minor bug fix"