Refactoring Language component
change declarations