Changed enum names to uppercase.
updated getLabelFull() method.
Corrected deprecation bug.