Transformator/ClassConstant

Resolve #588
Fix #583
right, i was just trying to avoid the nuance of repeating the same word twice