Fixed constants names.
Few changes