refactoring
properties renaming
EAP properties introduced
refactoring