Carmen country fixed
Refactoring and changing names