Fix Route pattern when groupId has more than one element
Fix class name after refactoring