Private properties name refactoring
Core components refactoring